[gtk+/wip/baedert/gl: 51/111] gl render ops: Rename a member



commit 74b15cbe7e6846cedf6fe4830c9c40b4140f458e
Author: Timm Bäder <mail baedert org>
Date:   Fri Nov 24 10:24:49 2017 +0100

    gl render ops: Rename a member

 gsk/gl/gskglrenderer.c         |    4 ++--
 gsk/gl/gskglrenderops.c        |    4 ++--
 gsk/gl/gskglrenderopsprivate.h |    3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 66dcfeb..ccbc659 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -1184,8 +1184,8 @@ gsk_gl_renderer_render_ops (GskGLRenderer *self,
 
         case OP_DRAW:
           OP_PRINT (" -> draw %ld, size %ld and program %s\n",
-                    op->draw.vao_offset, op->draw.draw_size, program->name);
-          glDrawArrays (GL_TRIANGLES, op->draw.vao_offset, op->draw.draw_size);//GL_N_VERTICES);
+                    op->draw.vao_offset, op->draw.vao_size, program->name);
+          glDrawArrays (GL_TRIANGLES, op->draw.vao_offset, op->draw.vao_size);//GL_N_VERTICES);
           break;
 
         default:
diff --git a/gsk/gl/gskglrenderops.c b/gsk/gl/gskglrenderops.c
index 3a001af..93e7ad2 100644
--- a/gsk/gl/gskglrenderops.c
+++ b/gsk/gl/gskglrenderops.c
@@ -228,7 +228,7 @@ ops_draw (RenderOpBuilder     *builder,
       RenderOp new_draw;
       new_draw.op = OP_DRAW;
       new_draw.draw.vao_offset = last_op->draw.vao_offset;
-      new_draw.draw.draw_size = last_op->draw.draw_size + GL_N_VERTICES;
+      new_draw.draw.vao_size = last_op->draw.vao_size + GL_N_VERTICES;
 
       last_op->op = OP_CHANGE_VAO;
       memcpy (&last_op->vertex_data, vertex_data, sizeof(GskQuadVertex) * GL_N_VERTICES);
@@ -247,7 +247,7 @@ ops_draw (RenderOpBuilder     *builder,
 
       op.op = OP_DRAW;
       op.draw.vao_offset = offset;
-      op.draw.draw_size = GL_N_VERTICES;
+      op.draw.vao_size = GL_N_VERTICES;
       g_array_append_val (builder->render_ops, op);
     }
 
diff --git a/gsk/gl/gskglrenderopsprivate.h b/gsk/gl/gskglrenderopsprivate.h
index fee25af..12d68b2 100644
--- a/gsk/gl/gskglrenderopsprivate.h
+++ b/gsk/gl/gskglrenderopsprivate.h
@@ -97,8 +97,9 @@ typedef struct
     } linear_gradient;
     struct {
       gsize vao_offset;
-      gsize draw_size;
+      gsize vao_size;
     } draw;
+
   };
 } RenderOp;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]