summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-01-19 19:30:18 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-01-19 19:30:18 +0000
commitc7449e097b90303f43164e0de6c8a98f25319424 (patch)
tree1117aac9218fe301842093ba0c6ee4a8663c99d9
parent87e6e4e60ad51833a4f2e452fcede4ef4b0838d1 (diff)
evas gl - fix patch that fixed warnings that then broke evas gl tests
even though it was reviewed... 8a617fda979d1522a880f3e57d2e1adfc9f20814 broke the evas gl tests. this fixes that.
-rw-r--r--src/bin/elementary/test_glview.c2
-rw-r--r--src/bin/elementary/test_glview_manygears.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 8df1fdd..2a42b95 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -249,7 +249,7 @@ draw_gear(GLData *gld, Gear *gear, GLfloat *m,
249 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 249 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
250 6 * sizeof(GLfloat), NULL); 250 6 * sizeof(GLfloat), NULL);
251 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 251 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
252 6 * sizeof(GLfloat), (GLfloat *)(0 + 3 * sizeof(GLfloat *))); 252 6 * sizeof(GLfloat), (GLfloat *)(0 + 3 * sizeof(GLfloat)));
253 gl->glEnableVertexAttribArray(0); 253 gl->glEnableVertexAttribArray(0);
254 gl->glEnableVertexAttribArray(1); 254 gl->glEnableVertexAttribArray(1);
255 gl->glDrawArrays(GL_TRIANGLE_STRIP, 0, gear->count); 255 gl->glDrawArrays(GL_TRIANGLE_STRIP, 0, gear->count);
diff --git a/src/bin/elementary/test_glview_manygears.c b/src/bin/elementary/test_glview_manygears.c
index 6161341..97e9e88 100644
--- a/src/bin/elementary/test_glview_manygears.c
+++ b/src/bin/elementary/test_glview_manygears.c
@@ -461,7 +461,7 @@ draw_gear(GLData *gld, Gear *gear, GLfloat *transform,
461 461
462 // Set up the position of the attributes in the vertex buffer object 462 // Set up the position of the attributes in the vertex buffer object
463 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), NULL); 463 gl->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), NULL);
464 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), (GLfloat *)(0 + 3 * sizeof(GLfloat *))); 464 gl->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), (GLfloat *)(0 + 3 * sizeof(GLfloat)));
465 465
466 // Enable the attributes 466 // Enable the attributes
467 gl->glEnableVertexAttribArray(0); 467 gl->glEnableVertexAttribArray(0);