Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
b3ac5901
Commit
b3ac5901
authored
Oct 21, 2016
by
Jan Möbius
Browse files
Fixed more warnings in DrawMesh
parent
56ec47e5
Pipeline
#3273
passed with stage
in 59 minutes and 58 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ACG/GL/globjects.cc
View file @
b3ac5901
...
...
@@ -797,7 +797,7 @@ TextureBuffer::~TextureBuffer() {
}
void
TextureBuffer
::
setBufferData
(
in
t
_size
,
const
void
*
_data
,
GLenum
_internalFormat
,
GLenum
_usage
)
{
size_
t
_size
,
const
void
*
_data
,
GLenum
_internalFormat
,
GLenum
_usage
)
{
#if defined(GL_ARB_texture_buffer_object)
if
(
supportsTextureBuffer
())
{
// setup buffer object
...
...
@@ -805,7 +805,7 @@ void TextureBuffer::setBufferData(
glGenBuffers
(
1
,
&
buffer_
);
glBindBuffer
(
GL_TEXTURE_BUFFER
,
buffer_
);
glBufferData
(
GL_TEXTURE_BUFFER
,
_size
,
_data
,
_usage
);
glBufferData
(
GL_TEXTURE_BUFFER
,
static_cast
<
GLsizei
>
(
_size
)
,
_data
,
_usage
);
usage_
=
_usage
;
fmt_
=
_internalFormat
;
...
...
ACG/GL/globjects.hh
View file @
b3ac5901
...
...
@@ -530,9 +530,9 @@ public:
// _data buffer data
// _internalFormat format of buffer - http://www.opengl.org/sdk/docs/man3/xhtml/glTexBuffer.xml
// _usage buffer usage hint - https://www.opengl.org/sdk/docs/man3/xhtml/glBufferData.xml
void
setBufferData
(
in
t
_size
,
const
void
*
_data
,
GLenum
_internalFormat
,
GLenum
_usage
=
GL_STATIC_DRAW
);
void
setBufferData
(
size_
t
_size
,
const
void
*
_data
,
GLenum
_internalFormat
,
GLenum
_usage
=
GL_STATIC_DRAW
);
in
t
getBufferSize
()
const
{
return
bufferSize_
;}
size_
t
getBufferSize
()
const
{
return
bufferSize_
;}
GLuint
getBufferId
()
const
{
return
buffer_
;}
...
...
@@ -547,7 +547,7 @@ public:
private:
in
t
bufferSize_
;
size_
t
bufferSize_
;
GLuint
buffer_
;
GLenum
usage_
;
GLenum
fmt_
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment