Commit: dd95926c6e734a53346e2375b50f9572921143b0
Author: Antony Riakiotakis
Date: Tue Mar 24 17:41:57 2015 +0100
Branches: temp_viewport_fx_merge
https://developer.blender.org/rBdd95926c6e734a53346e2375b50f9572921143b0
Fix compilation with scons
===================================================================
M SConstruct
M source/blender/gpu/SConscript
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/gpu/intern/gpu_state_latch.c
===================================================================
diff --git a/SConstruct b/SConstruct
index 00a95b0..e23fd05 100644
--- a/SConstruct
+++ b/SConstruct
@@ -775,6 +775,19 @@ if B.targets != ['cudakernels']:
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_depth_resolve.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_vert.glsl")
data_to_c_simple("intern/opencolorio/gpu_shader_display_transform.glsl")
+
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_common_uniforms.glsl")
+
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_common_constants.glsl")
+
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_common_attribs.glsl")
+
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_pixels_uniforms.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_pixels_vert.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_pixels_frag.glsl")
+
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_raster_uniforms.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_raster_vert.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_raster_frag.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_font_vert.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_font_frag.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_basic_vert.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_basic_frag.glsl")
# --- blender ---
data_to_c_simple("release/datafiles/bfont.pfb")
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index f52b39d..3f38b79 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -78,6 +78,20 @@ sources.extend((
os.path.join(env['DATA_SOURCES'], "gpu_shader_vertex_world.glsl.c"),
os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_frag.glsl.c"),
os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_vert.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_common_uniforms.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_common_constants.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_common_attribs.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_pixels_uniforms.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_pixels_vert.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_pixels_frag.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_raster_uniforms.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_raster_vert.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_raster_frag.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_font_vert.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_font_frag.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_basic_vert.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_basic_frag.glsl.c")
+
))
env.BlenderLib('bf_gpu', sources, incs, defines=defs, libtype=['core',
'player'], priority=[160, 110])
diff --git a/source/blender/gpu/intern/gpu_draw.c
b/source/blender/gpu/intern/gpu_draw.c
index 5c8881c..ce78e736 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -257,9 +257,8 @@ void GPU_set_gpu_mipmapping(int gpu_mipmap)
/* only actually enable if it's supported */
GTS.gpu_mipmap = gpu_mipmap && (GLEW_VERSION_3_0 ||
GLEW_ARB_framebuffer_object ||
- GLEW_EXT_framebuffer_object ||
- GLEW_ES_VERSION_2_0 ||
- GLEW_OES_framebuffer_object );
+ GLEW_EXT_framebuffer_object
+ );
if (old_value != GTS.gpu_mipmap) {
GPU_free_images();
diff --git a/source/blender/gpu/intern/gpu_extensions.c
b/source/blender/gpu/intern/gpu_extensions.c
index 8b977a6..9f7ab6e 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -168,7 +168,7 @@ static GLint get_max_textures(void)
maxTextureCoords = 0;
maxCombinedTextureImageUnits = 0;
- if (GLEW_VERSION_2_0 || GLEW_ES_VERSION_2_0 ||
GLEW_ARB_fragment_program) {
+ if (GLEW_VERSION_2_0 || GLEW_ARB_fragment_program) {
#if !defined(GLEW_ES_ONLY)
if (GPU_PROFILE_COMPAT) {
/* size of gl_TexCoord array in GLSL */
diff --git a/source/blender/gpu/intern/gpu_state_latch.c
b/source/blender/gpu/intern/gpu_state_latch.c
index 40124b7..634d904 100644
--- a/source/blender/gpu/intern/gpu_state_latch.c
+++ b/source/blender/gpu/intern/gpu_state_latch.c
@@ -111,10 +111,10 @@ void gpuDepthRange(GLdouble near, GLdouble far)
#endif
#if !defined(GLEW_NO_ES)
- if (GPU_PROFILE_ES20) {
- GPU_CHECK(glDepthRangef((GLfloat)near, (GLfloat)far));
+// if (GPU_PROFILE_ES20) {
+ GPU_CHECK_ERRORS_AROUND(glDepthRangef((GLfloat)near,
(GLfloat)far));
return;
- }
+// }
#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
