[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58447] branches/soc-2013-viewport_fx: Have compile errors due to compiling with ES headers down to SELECT mode and PushAttrib /PopAttrib
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sat Jul 20 16:58:22 CEST 2013
Revision: 58447
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58447
Author: jwilkins
Date: 2013-07-20 14:58:22 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
Have compile errors due to compiling with ES headers down to SELECT mode and PushAttrib/PopAttrib
Modified Paths:
--------------
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glesew.h
branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h
branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/reeb.c
branches/soc-2013-viewport_fx/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2013-viewport_fx/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_icons.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_ops.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_panel.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-viewport_fx/source/blender/editors/mask/mask_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/glutil.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/screen_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/screendump.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-viewport_fx/source/blender/editors/space_image/image_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_node/drawnode.c
branches/soc-2013-viewport_fx/source/blender/editors/space_node/node_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_compatibility.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_matrix.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_object.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_glew.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gl11.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_primitives.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.h
branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_playanim.c
Added Paths:
-----------
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_raster.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_raster.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.h
Modified: branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glesew.h
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glesew.h 2013-07-20 12:24:53 UTC (rev 58446)
+++ branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glesew.h 2013-07-20 14:58:22 UTC (rev 58447)
@@ -663,10 +663,12 @@
#define glTexParameterx GLEW_GET_FUN(__glewTexParameterx)
#define glTranslatex GLEW_GET_FUN(__glewTranslatex)
-#define GLEW_ES_VERSION_1_0 GLEW_GET_VAR(__GLEW_ES_VERSION_1_0)
-
+#else // XXX
+#define GL_ES_VERSION_1_0 0 // XXX jwilkins: define version token
#endif /* !GL_ES_VERSION_1_0 */
+#define GLEW_ES_VERSION_1_0 GLEW_GET_VAR(__GLEW_ES_VERSION_1_0) // XXX jwilkins: always needs to be defined
+
/* -------------------------- GL_ES_VERSION_CL_1_1 ------------------------- */
#if !defined(GL_ES_VERSION_CL_1_1)
@@ -847,10 +849,12 @@
#define glTexParameteriv GLEW_GET_FUN(__glewTexParameteriv)
#define glTexParameterxv GLEW_GET_FUN(__glewTexParameterxv)
-#define GLEW_ES_VERSION_CL_1_1 GLEW_GET_VAR(__GLEW_ES_VERSION_CL_1_1)
-
+#else // XXX
+#define GL_ES_VERSION_CL_1_1 0 // XXX jwilkins: define version token
#endif /* !GL_ES_VERSION_CL_1_1 */
+#define GLEW_ES_VERSION_CL_1_1 GLEW_GET_VAR(__GLEW_ES_VERSION_CL_1_1) // XXX jwilkins: always needs to be defined
+
/* -------------------------- GL_ES_VERSION_CM_1_1 ------------------------- */
#if !defined(GL_ES_VERSION_CM_1_1)
@@ -881,10 +885,12 @@
#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv)
#define glTexParameterfv GLEW_GET_FUN(__glewTexParameterfv)
-#define GLEW_ES_VERSION_CM_1_1 GLEW_GET_VAR(__GLEW_ES_VERSION_CM_1_1)
-
+#else // XXX
+#define GL_ES_VERSION_CM_1_1 0 // XXX jwilkins: define version token
#endif /* !GL_ES_VERSION_CM_1_1 */
+#define GLEW_ES_VERSION_CM_1_1 GLEW_GET_VAR(__GLEW_ES_VERSION_CM_1_1) // XXX jwilkins: always needs to be defined
+
/* --------------------------- GL_ES_VERSION_2_0 --------------------------- */
#if !defined(GL_ES_VERSION_2_0)
@@ -1128,6 +1134,7 @@
typedef void (GLAPIENTRY * PFNGLGETFLOATVPROC) (GLenum , GLfloat *); // XXX jwilkins: missing function
typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFPROC) (GLclampf zNear, GLclampf zFar); // XXX jwilkins: missing function
typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture); // XXX jwilkins: missing function
+typedef void (GLAPIENTRY * PFNGLGETBOOLEANVPROC) (GLenum, GLboolean *); // XXX jwilkins: missing function
#define glAttachShader GLEW_GET_FUN(__glewAttachShader)
#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
@@ -1223,6 +1230,7 @@
#define glGetFloatv GLEW_GET_FUN(__glewGetFloatv) // XXX jwilkins: missing function
#define glDepthRangef GLEW_GET_FUN(__glewDepthRangef) // XXX jwilkins: missing function
#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture) // XXX jwilkins: missing function
+#define glGetBooleanv GLEW_GET_FUN(__glewGetBooleanv) // XXX jwilkins: missing function
#define GLEW_ES_VERSION_2_0 GLEW_GET_VAR(__GLEW_ES_VERSION_2_0)
@@ -1851,6 +1859,7 @@
#endif /* !GL_EXT_sRGB */
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
/* --------------------- GL_EXT_separate_shader_objects -------------------- */
#if !defined(GL_EXT_separate_shader_objects)
@@ -1928,6 +1937,7 @@
#define GLEW_EXT_separate_shader_objects GLEW_GET_VAR(__GLEW_EXT_separate_shader_objects)
#endif /* !GL_EXT_separate_shader_objects */
+#endif // XXX
/* -------------------- GL_EXT_shader_framebuffer_fetch -------------------- */
@@ -3851,7 +3861,8 @@
GLEW_FUN_EXPORT PFNGLGETFLOATVPROC __glewGetFloatv; // XXX jwilkins: missing function
GLEW_FUN_EXPORT PFNGLDEPTHRANGEFPROC __glewDepthRangef; // XXX jwilkins: missing function
GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture; // XXX jwilkins: missing function
-#endif
+GLEW_FUN_EXPORT PFNGLGETBOOLEANVPROC __glewGetBooleanv; // XXX jwilkins: missing function
+#endif // XXX
GLEW_FUN_EXPORT PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD;
GLEW_FUN_EXPORT PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD;
@@ -3923,6 +3934,7 @@
GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVEXTPROC __glewGetnUniformivEXT;
GLEW_FUN_EXPORT PFNGLREADNPIXELSEXTPROC __glewReadnPixelsEXT;
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
GLEW_FUN_EXPORT PFNGLACTIVESHADERPROGRAMEXTPROC __glewActiveShaderProgramEXT;
GLEW_FUN_EXPORT PFNGLBINDPROGRAMPIPELINEEXTPROC __glewBindProgramPipelineEXT;
GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMVEXTPROC __glewCreateShaderProgramvEXT;
@@ -3953,6 +3965,7 @@
GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT;
GLEW_FUN_EXPORT PFNGLUSEPROGRAMSTAGESEXTPROC __glewUseProgramStagesEXT;
GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPIPELINEEXTPROC __glewValidateProgramPipelineEXT;
+#endif // XXX
GLEW_FUN_EXPORT PFNGLTEXSTORAGE1DEXTPROC __glewTexStorage1DEXT;
GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DEXTPROC __glewTexStorage2DEXT;
Modified: branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h 2013-07-20 12:24:53 UTC (rev 58446)
+++ branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h 2013-07-20 14:58:22 UTC (rev 58447)
@@ -1588,7 +1588,7 @@
#define glLightModeliv GLEW_GET_FUN(__glewLightModeliv)
#define glLighti GLEW_GET_FUN(__glewLighti)
#define glLightiv GLEW_GET_FUN(__glewLightiv)
-#define glLineStipple GLEW_GET_FUN(__glewLineStipple)
+#define gpuLineStipple GLEW_GET_FUN(__glewLineStipple)
#define glListBase GLEW_GET_FUN(__glewListBase)
#define glLoadMatrixd GLEW_GET_FUN(__glewLoadMatrixd)
#define glLoadName GLEW_GET_FUN(__glewLoadName)
@@ -5473,6 +5473,7 @@
#endif /* !GL_ARB_seamless_cube_map */
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
/* --------------------- GL_ARB_separate_shader_objects -------------------- */
#if !defined(GL_ARB_separate_shader_objects)
@@ -5613,6 +5614,7 @@
#define GLEW_ARB_separate_shader_objects GLEW_GET_VAR(__GLEW_ARB_separate_shader_objects)
#endif /* !GL_ARB_separate_shader_objects */
+#endif // XXX
/* --------------------- GL_ARB_shader_atomic_counters --------------------- */
@@ -9735,6 +9737,7 @@
#endif /* !GL_EXT_secondary_color */
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
/* --------------------- GL_EXT_separate_shader_objects -------------------- */
#if !defined(GL_EXT_separate_shader_objects)
@@ -9753,6 +9756,7 @@
#define GLEW_EXT_separate_shader_objects GLEW_GET_VAR(__GLEW_EXT_separate_shader_objects)
#endif /* !GL_EXT_separate_shader_objects */
+#endif // XXX
/* --------------------- GL_EXT_separate_specular_color -------------------- */
@@ -19943,7 +19947,9 @@
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_shading;
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sampler_objects;
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cube_map;
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_separate_shader_objects;
+#endif
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counters;
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_bit_encoding;
GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_load_store;
@@ -20084,7 +20090,9 @@
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_rescale_normal;
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_scene_marker;
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color;
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects;
+#endif
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color;
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store;
GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs;
Modified: branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c 2013-07-20 12:24:53 UTC (rev 58446)
+++ branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c 2013-07-20 14:58:22 UTC (rev 58447)
@@ -3538,6 +3538,7 @@
PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT = NULL;
PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT = NULL;
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
PFNGLACTIVESHADERPROGRAMEXTPROC __glewActiveShaderProgramEXT = NULL;
PFNGLBINDPROGRAMPIPELINEEXTPROC __glewBindProgramPipelineEXT = NULL;
PFNGLCREATESHADERPROGRAMVEXTPROC __glewCreateShaderProgramvEXT = NULL;
@@ -3568,6 +3569,7 @@
PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT = NULL;
PFNGLUSEPROGRAMSTAGESEXTPROC __glewUseProgramStagesEXT = NULL;
PFNGLVALIDATEPROGRAMPIPELINEEXTPROC __glewValidateProgramPipelineEXT = NULL;
+#endif
PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback = NULL;
PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl = NULL;
@@ -3726,7 +3728,9 @@
GLboolean __GLEW_ARB_sample_shading = GL_FALSE;
GLboolean __GLEW_ARB_sampler_objects = GL_FALSE;
GLboolean __GLEW_ARB_seamless_cube_map = GL_FALSE;
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
GLboolean __GLEW_ARB_separate_shader_objects = GL_FALSE;
+#endif
GLboolean __GLEW_ARB_shader_atomic_counters = GL_FALSE;
GLboolean __GLEW_ARB_shader_bit_encoding = GL_FALSE;
GLboolean __GLEW_ARB_shader_image_load_store = GL_FALSE;
@@ -3867,7 +3871,9 @@
GLboolean __GLEW_EXT_rescale_normal = GL_FALSE;
GLboolean __GLEW_EXT_scene_marker = GL_FALSE;
GLboolean __GLEW_EXT_secondary_color = GL_FALSE;
+#if 0 // XXX jwilkins: there is an inconsistency between the ES and Non-ES versions of this extension??
GLboolean __GLEW_EXT_separate_shader_objects = GL_FALSE;
+#endif
GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE;
GLboolean __GLEW_EXT_shader_image_load_store = GL_FALSE;
GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE;
@@ -4342,7 +4348,9 @@
GLboolean __GLEW_APPLE_rgb_422 = GL_FALSE;
GLboolean __GLEW_EXT_blend_minmax = GL_FALSE;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list