[Bf-blender-cvs] [5c7b8cfffa5] blender2.8: OpenGL: remove GL_MAP1_VERTEX_3

Mike Erwin noreply at git.blender.org
Thu Apr 27 15:32:02 CEST 2017


Commit: 5c7b8cfffa5da0e88492d652d1d4137ee4cb0cf2
Author: Mike Erwin
Date:   Wed Apr 26 17:55:59 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB5c7b8cfffa5da0e88492d652d1d4137ee4cb0cf2

OpenGL: remove GL_MAP1_VERTEX_3

This is related to OpenGL evaluators (old feature). From my understanding, we don't seem to be actually using it.

Part of T51164

===================================================================

M	source/blender/editors/space_node/node_draw.c
M	source/blender/gpu/GPU_draw.h
M	source/blender/gpu/intern/gpu_draw.c

===================================================================

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 42cb2463651..a4ea4d2524c 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1360,7 +1360,6 @@ void drawnodespace(const bContext *C, ARegion *ar)
 
 	/* only set once */
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_MAP1_VERTEX_3);
 	
 	/* nodes */
 	snode_set_context(C);
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 127c2525de8..b9bf39118db 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -197,7 +197,6 @@ typedef struct GPUStateValues
 	unsigned int is_lighting : 1;
 	unsigned int is_line_smooth : 1;
 	unsigned int is_color_logic_op : 1;
-	unsigned int is_map1_vertex3 : 1;
 	unsigned int is_multisample : 1;
 	unsigned int is_normalize : 1;
 	unsigned int is_polygon_offset_line : 1;
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 55b3f170962..1d4bfdeef6d 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -2547,7 +2547,6 @@ void gpuSaveState(GPUStateValues *values, eGPUStateMask mask)
 
 		values->is_line_smooth = glIsEnabled(GL_LINE_SMOOTH);
 		values->is_color_logic_op = glIsEnabled(GL_COLOR_LOGIC_OP);
-		values->is_map1_vertex3 = glIsEnabled(GL_MAP1_VERTEX_3);
 		values->is_multisample = glIsEnabled(GL_MULTISAMPLE);
 		values->is_normalize = glIsEnabled(GL_NORMALIZE);
 		values->is_polygon_offset_line = glIsEnabled(GL_POLYGON_OFFSET_LINE);
@@ -2612,7 +2611,6 @@ void gpuRestoreState(GPUStateValues *values)
 
 		restore_mask(GL_LINE_SMOOTH, values->is_line_smooth);
 		restore_mask(GL_COLOR_LOGIC_OP, values->is_color_logic_op);
-		restore_mask(GL_MAP1_VERTEX_3, values->is_map1_vertex3);
 		restore_mask(GL_MULTISAMPLE, values->is_multisample);
 		restore_mask(GL_NORMALIZE, values->is_normalize);
 		restore_mask(GL_POLYGON_OFFSET_LINE, values->is_polygon_offset_line);




More information about the Bf-blender-cvs mailing list