diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-12 17:14:36 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-18 13:50:13 +0100 |
| commit | a5de977a56bb34e1705635121b20cb58220a7a99 (patch) | |
| tree | 9bfd626f34107b2fe8a63d86800aa296474de3d4 | |
| parent | dc85f58e2183434e4dccd00c61254f4c0418546c (diff) | |
util/piglit-vbo: do not use 'and' in a conditional statement
I'm not entirely sure how piglit build with gcc as is, yet VC compiler
seems very unhappy about this.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | tests/util/piglit-vbo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/util/piglit-vbo.cpp b/tests/util/piglit-vbo.cpp index 8a6ef90fe..19fddde12 100644 --- a/tests/util/piglit-vbo.cpp +++ b/tests/util/piglit-vbo.cpp @@ -284,7 +284,7 @@ vertex_attrib_description::setup(size_t *offset, size_t stride) const glVertexAttribPointer(this->index, this->count, this->data_type, GL_FALSE, stride, (void *) *offset); - } else if (piglit_is_gles() and piglit_get_gl_version() < 30) { + } else if (piglit_is_gles() && piglit_get_gl_version() < 30) { fprintf(stderr,"vertex_attrib_description fail. no int support\n"); } else { glVertexAttribIPointer(this->index, this->count, |