[Bf-blender-cvs] [91cd1d9] GPU_data_request: More changes to defines, add GPUx prefix to public API
Antony Riakiotakis
noreply at git.blender.org
Fri Apr 3 12:32:58 CEST 2015
Commit: 91cd1d98f684dad7f1a331d8aee71703720c1ab0
Author: Antony Riakiotakis
Date: Fri Apr 3 12:32:45 2015 +0200
Branches: GPU_data_request
https://developer.blender.org/rB91cd1d98f684dad7f1a331d8aee71703720c1ab0
More changes to defines, add GPUx prefix to public API
===================================================================
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPUx_draw.h
M source/blender/gpu/GPUx_element.h
M source/blender/gpu/GPUx_state.h
M source/blender/gpu/GPUx_vbo.h
M source/blender/gpu/intern/gpux_draw.c
M source/blender/gpu/intern/gpux_element.c
M source/blender/gpu/intern/gpux_element_private.h
M source/blender/gpu/intern/gpux_state.c
M source/blender/gpu/intern/gpux_vbo.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index f9fb613..1e1453b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2036,26 +2036,26 @@ static void drawcamera_new_new(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ba
/* use default GL state for lines */
if (is_view) {
- VertexBuffer *verts = vertex_buffer_create(1, 4);
- ElementList *elem = element_list_create(GL_LINES, 4, 3);
- specify_attrib(verts, 0, GL_VERTEX_ARRAY, GL_FLOAT, 3, KEEP_FLOAT);
- fill_attrib(verts, 0, vec);
- vertex_buffer_prime(verts);
+ VertexBuffer *verts = GPUx_vertex_buffer_create(1, 4);
+ ElementList *elem = GPUx_element_list_create(GL_LINES, 4, 3);
+ GPUx_specify_attrib(verts, 0, GL_VERTEX_ARRAY, GL_FLOAT, 3, KEEP_FLOAT);
+ GPUx_fill_attrib(verts, 0, vec);
+ GPUx_vertex_buffer_prime(verts);
/* camera frame */
- set_line_vertices(elem, 0, 0,1);
- set_line_vertices(elem, 1, 1,2);
- set_line_vertices(elem, 2, 2,3);
- set_line_vertices(elem, 3, 3,0);
+ GPUx_set_line_vertices(elem, 0, 0,1);
+ GPUx_set_line_vertices(elem, 1, 1,2);
+ GPUx_set_line_vertices(elem, 2, 2,3);
+ GPUx_set_line_vertices(elem, 3, 3,0);
- draw_lines(&default_state.common, &default_state.line, verts, elem);
+ GPUx_draw_lines(&default_state.common, &default_state.line, verts, elem);
- element_list_discard(elem);
- vertex_buffer_discard(verts);
+ GPUx_element_list_discard(elem);
+ GPUx_vertex_buffer_discard(verts);
}
else {
- VertexBuffer *verts = vertex_buffer_create(1, 8);
- ElementList *elem = element_list_create(GL_LINES, 11, 7);
+ VertexBuffer *verts = GPUx_vertex_buffer_create(1, 8);
+ ElementList *elem = GPUx_element_list_create(GL_LINES, 11, 7);
zero_v3(vec[4]); /* center point */
@@ -2077,28 +2077,28 @@ static void drawcamera_new_new(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ba
copy_v3_v3(vec[7], tvec); /* top */
}
- specify_attrib(verts, 0, GL_VERTEX_ARRAY, GL_FLOAT, 3, KEEP_FLOAT);
- fill_attrib(verts, 0, vec);
- vertex_buffer_prime(verts);
+ GPUx_specify_attrib(verts, 0, GL_VERTEX_ARRAY, GL_FLOAT, 3, KEEP_FLOAT);
+ GPUx_fill_attrib(verts, 0, vec);
+ GPUx_vertex_buffer_prime(verts);
/* camera frame */
- set_line_vertices(elem, 0, 0,1);
- set_line_vertices(elem, 1, 1,2);
- set_line_vertices(elem, 2, 2,3);
- set_line_vertices(elem, 3, 3,0);
+ GPUx_set_line_vertices(elem, 0, 0,1);
+ GPUx_set_line_vertices(elem, 1, 1,2);
+ GPUx_set_line_vertices(elem, 2, 2,3);
+ GPUx_set_line_vertices(elem, 3, 3,0);
/* center point to camera frame */
- set_line_vertices(elem, 4, 0,4);
- set_line_vertices(elem, 5, 1,4);
- set_line_vertices(elem, 6, 2,4);
- set_line_vertices(elem, 7, 3,4);
+ GPUx_set_line_vertices(elem, 4, 0,4);
+ GPUx_set_line_vertices(elem, 5, 1,4);
+ GPUx_set_line_vertices(elem, 6, 2,4);
+ GPUx_set_line_vertices(elem, 7, 3,4);
/* arrow on top */
- set_line_vertices(elem, 8, 5,6);
- set_line_vertices(elem, 9, 6,7);
- set_line_vertices(elem, 10, 7,5);
+ GPUx_set_line_vertices(elem, 8, 5,6);
+ GPUx_set_line_vertices(elem, 9, 6,7);
+ GPUx_set_line_vertices(elem, 10, 7,5);
- draw_lines(&default_state.common, &default_state.line, verts, elem);
+ GPUx_draw_lines(&default_state.common, &default_state.line, verts, elem);
- element_list_discard(elem);
+ GPUx_element_list_discard(elem);
/* draw an outline arrow for inactive cameras and filled
* for active cameras. We actually draw both outline+filled
@@ -2108,15 +2108,15 @@ static void drawcamera_new_new(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ba
polygon_state.draw_front = true;
polygon_state.draw_back = true;
- elem = element_list_create(GL_TRIANGLES, 1, 7);
- set_triangle_vertices(elem, 0, 5,6,7);
+ elem = GPUx_element_list_create(GL_TRIANGLES, 1, 7);
+ GPUx_set_triangle_vertices(elem, 0, 5,6,7);
- draw_triangles(&default_state.common, &polygon_state, verts, elem);
+ GPUx_draw_triangles(&default_state.common, &polygon_state, verts, elem);
- element_list_discard(elem);
+ GPUx_element_list_discard(elem);
}
- vertex_buffer_discard(verts);
+ GPUx_vertex_buffer_discard(verts);
}
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 99f07da..65dec7d 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3601,7 +3601,7 @@ static void view3d_main_area_draw_viewport_new(const bContext *UNUSED(C), Scene
* Hand-crafted logic here is tricky; will simplify later.
*/
- reset_draw_state(); /* for code below which uses GPUx_state */
+ GPUx_reset_draw_state(); /* for code below which uses GPUx_state */
/* draw meshes (and cameras) not being edited (selected or not) */
for (base = scene->base.first; base; base = base->next) {
@@ -3619,7 +3619,7 @@ static void view3d_main_area_draw_viewport_new(const bContext *UNUSED(C), Scene
}
}
- reset_draw_state(); /* for code below which does NOT use GPUx_state */
+ GPUx_reset_draw_state(); /* for code below which does NOT use GPUx_state */
/* draw non-meshes not being edited nor selected */
for (base = scene->base.first; base; base = base->next) {
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 58fe387..4c58efb 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -89,6 +89,10 @@ set(SRC
GPU_simple_shader.h
GPU_select.h
GPU_compositing.h
+ GPUx_vbo.h
+ GPUx_draw.h
+ GPUx_element.h
+ GPUx_state.h
intern/gpu_codegen.h
intern/gpu_private.h
intern/gpux_element_private.h
diff --git a/source/blender/gpu/GPUx_draw.h b/source/blender/gpu/GPUx_draw.h
index ffbbdc2..205de68 100644
--- a/source/blender/gpu/GPUx_draw.h
+++ b/source/blender/gpu/GPUx_draw.h
@@ -9,11 +9,11 @@
#include "GPUx_element.h"
/* pass ElementList = NULL to draw all vertices from VertexBuffer in order */
-void draw_points(const CommonDrawState*, const PointDrawState*, const VertexBuffer*, const ElementList*);
-void draw_lines(const CommonDrawState*, const LineDrawState*, const VertexBuffer*, const ElementList*);
-void draw_triangles(const CommonDrawState*, const PolygonDrawState*, const VertexBuffer*, const ElementList*);
+void GPUx_draw_points(const CommonDrawState*, const PointDrawState*, const VertexBuffer*, const ElementList*);
+void GPUx_draw_lines(const CommonDrawState*, const LineDrawState*, const VertexBuffer*, const ElementList*);
+void GPUx_draw_triangles(const CommonDrawState*, const PolygonDrawState*, const VertexBuffer*, const ElementList*);
/* generic version uses ElementList's primitive type */
-void draw_primitives(const CommonDrawState*, const void *primitive_state, const VertexBuffer*, const ElementList*);
+void GPUx_draw_primitives(const CommonDrawState*, const void *primitive_state, const VertexBuffer*, const ElementList*);
#endif /* BLENDER_GL_DRAW_PRIMITIVES */
diff --git a/source/blender/gpu/GPUx_element.h b/source/blender/gpu/GPUx_element.h
index 2e5c46f..d57be96 100644
--- a/source/blender/gpu/GPUx_element.h
+++ b/source/blender/gpu/GPUx_element.h
@@ -12,13 +12,13 @@
struct ElementList; /* forward declaration */
typedef struct ElementList ElementList;
-ElementList *element_list_create(GLenum prim_type, unsigned prim_ct, unsigned max_index);
-void element_list_discard(ElementList*);
+ElementList *GPUx_element_list_create(GLenum prim_type, unsigned prim_ct, unsigned max_index);
+void GPUx_element_list_discard(ElementList*);
-void set_point_vertex(ElementList*, unsigned prim_idx, unsigned v1);
-void set_line_vertices(ElementList*, unsigned prim_idx, unsigned v1, unsigned v2);
-void set_triangle_vertices(ElementList*, unsigned prim_idx, unsigned v1, unsigned v2, unsigned v3);
+void GPUx_set_point_vertex(ElementList*, unsigned prim_idx, unsigned v1);
+void GPUx_set_line_vertices(ElementList*, unsigned prim_idx, unsigned v1, unsigned v2);
+void GPUx_set_triangle_vertices(ElementList*, unsigned prim_idx, unsigned v1, unsigned v2, unsigned v3);
-void optimize(ElementList*); /* optionally call this after setting all vertex indices */
+void GPUx_optimize(ElementList*); /* optionally call this after setting all vertex indices */
#endif /* BLENDER_GL_ELEMENT_LIST */
diff --git a/source/blender/gpu/GPUx_state.h b/source/blender/gpu/GPUx_state.h
index b57509f..84fa995 100644
--- a/source/blender/gpu/GPUx_state.h
+++ b/source/blender/gpu/GPUx_state.h
@@ -45,16 +45,16 @@ typedef struct {
extern const DrawState default_state;
-void reset_draw_state(void); /* to defaults */
+void GPUx_reset_draw_state(void); /* to defaults */
/* ^-- call this before using set_*_state functions below */
/* incrementally update current GL state */
-void set_common_state(const CommonDrawState*);
-void set_point_state(const PointDrawState*);
-void set_line_state(const LineDrawState*);
-void set_polygon_state(const PolygonDrawState*);
+void GPUx_set_common_state(const CommonDrawState*);
+void GPUx_set_point_state(const PointDrawState*);
+void GPUx_set_line_state(const LineDrawState*);
+void GPUx_set_polygon_state(const PolygonDrawState*);
/* update everything regardless of current GL state */
-void force_state_update(void);
+void GPUx_force_state_update(void);
#endif /* BLENDER_GL_STATE */
diff --git a/source/blender/gpu/GPUx_vbo.h b/source/blender/gpu/GPUx_vbo.h
index a455d09..1ff6568 100644
--- a/source/blender/gpu/GPUx_vbo.h
+++ b/source/blender/gpu/GPUx_vbo.h
@@ -22,16 +22,16 @@ typedef enum {
CONVERT_INT_TO_FLOAT /* 127 (any int type) -> 127.0 */
} VertexFetchMode;
-VertexBuffer* vertex_buffer_create(unsigned attrib_ct, unsigned vertex_ct);
-void vertex_buffer_discard(VertexBuffer*);
+VertexBuffer* GPUx_vertex_buffer_create(unsigned attrib_ct, unsigned GPUx_vertex_ct);
+void GPUx_vertex_buffer_discard(VertexBuffer*);
-unsigned vertex_ct(const VertexBuffer*);
+unsigned GPUx_vertex_ct(const VertexBuffer*);
#ifdef PRINT
-void attrib_print(const VertexBuffer*, unsigned attrib_num);
+void GPUx_attrib_print(const VertexBuffer*, unsigned attrib_num);
#endif /* PR
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list