[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49801] trunk/blender: generate glsl shaders c files at build time.
Campbell Barton
ideasman42 at gmail.com
Sat Aug 11 15:01:45 CEST 2012
Revision: 49801
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49801
Author: campbellbarton
Date: 2012-08-11 13:01:44 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
generate glsl shaders c files at build time.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/gpu/SConscript
Removed Paths:
-------------
trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl.c
trunk/blender/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
trunk/blender/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
trunk/blender/source/blender/gpu/shaders/gpu_shader_vertex.glsl.c
trunk/blender/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl.c
trunk/blender/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-08-11 12:26:43 UTC (rev 49800)
+++ trunk/blender/SConstruct 2012-08-11 13:01:44 UTC (rev 49801)
@@ -498,6 +498,31 @@
B.root_build_dir + "data_sources/preview.blend.c",
"datatoc_preview_blend")
+# --- glsl ---
+ensure_data("source/blender/gpu/shaders/gpu_shader_material.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_material.glsl.c",
+ "datatoc_gpu_shader_material_glsl")
+ensure_data("source/blender/gpu/shaders/gpu_shader_vertex.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_vertex.glsl.c",
+ "datatoc_gpu_shader_vertex_glsl")
+ensure_data("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_sep_gaussian_blur_frag.glsl.c",
+ "datatoc_gpu_shader_sep_gaussian_blur_frag_glsl")
+ensure_data("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_sep_gaussian_blur_vert.glsl.c",
+ "datatoc_gpu_shader_sep_gaussian_blur_vert_glsl")
+ensure_data("source/blender/gpu/shaders/gpu_shader_material.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_material.glsl.c",
+ "datatoc_gpu_shader_material_glsl")
+ensure_data("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_vsm_store_frag.glsl.c",
+ "datatoc_gpu_shader_vsm_store_frag_glsl")
+ensure_data("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl",
+ B.root_build_dir + "data_sources/gpu_shader_vsm_store_vert.glsl.c",
+ "datatoc_gpu_shader_vsm_store_vert_glsl")
+
+
+
##### END DATAFILES ##########
Help(opts.GenerateHelpText(env))
Modified: trunk/blender/source/blender/gpu/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/gpu/CMakeLists.txt 2012-08-11 12:26:43 UTC (rev 49800)
+++ trunk/blender/source/blender/gpu/CMakeLists.txt 2012-08-11 13:01:44 UTC (rev 49801)
@@ -50,13 +50,6 @@
intern/gpu_draw.c
intern/gpu_extensions.c
intern/gpu_material.c
-
- shaders/gpu_shader_material.glsl.c
- shaders/gpu_shader_vertex.glsl.c
- shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
- shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
- shaders/gpu_shader_vsm_store_frag.glsl.c
- shaders/gpu_shader_vsm_store_vert.glsl.c
GPU_buffers.h
GPU_draw.h
@@ -65,6 +58,28 @@
intern/gpu_codegen.h
)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_material.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_material.glsl.c
+ datatoc_gpu_shader_material_glsl SRC)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_vertex.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_vertex.glsl.c
+ datatoc_gpu_shader_vertex_glsl SRC)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
+ datatoc_gpu_shader_sep_gaussian_blur_frag_glsl SRC)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_sep_gaussian_blur_vert.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
+ datatoc_gpu_shader_sep_gaussian_blur_vert_glsl SRC)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_material.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_material.glsl.c
+ datatoc_gpu_shader_material_glsl SRC)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_vsm_store_frag.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_vsm_store_frag.glsl.c
+ datatoc_gpu_shader_vsm_store_frag_glsl SRC)
+data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/shaders/gpu_shader_vsm_store_vert.glsl
+ ${CMAKE_CURRENT_BINARY_DIR}/shaders/gpu_shader_vsm_store_vert.glsl.c
+ datatoc_gpu_shader_vsm_store_vert_glsl SRC)
+
if(WITH_MOD_SMOKE)
add_definitions(-DWITH_SMOKE)
endif()
Modified: trunk/blender/source/blender/gpu/SConscript
===================================================================
--- trunk/blender/source/blender/gpu/SConscript 2012-08-11 12:26:43 UTC (rev 49800)
+++ trunk/blender/source/blender/gpu/SConscript 2012-08-11 13:01:44 UTC (rev 49801)
@@ -20,4 +20,16 @@
if env['WITH_BF_DDS']:
defs.append('WITH_DDS')
+# generated data files
+import os
+sources.extend((
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_material.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_vertex.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_frag.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_vert.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_material.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"),
+ ))
+
env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] )
Deleted: trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl.c
===================================================================
--- trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl.c 2012-08-11 12:26:43 UTC (rev 49800)
+++ trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl.c 2012-08-11 13:01:44 UTC (rev 49801)
@@ -1,1607 +0,0 @@
-/* DataToC output of file <gpu_shader_material_glsl> */
-
-int datatoc_gpu_shader_material_glsl_size = 51212;
-char datatoc_gpu_shader_material_glsl[] = {
- 10,102,108,111, 97,116, 32,101,120,112, 95, 98,
-108,101,110,100,101,114, 40,102,108,111, 97,116, 32,102, 41, 10,123, 10, 9,114,101,116,117,114,110, 32,112,111,119, 40, 50, 46,
- 55, 49, 56, 50, 56, 49, 56, 50, 56, 52, 54, 44, 32,102, 41, 59, 10,125, 10, 10,118,111,105,100, 32,114,103, 98, 95,116,111, 95,
-104,115,118, 40,118,101, 99, 52, 32,114,103, 98, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123,
- 10, 9,102,108,111, 97,116, 32, 99,109, 97,120, 44, 32, 99,109,105,110, 44, 32,104, 44, 32,115, 44, 32,118, 44, 32, 99,100,101,
-108,116, 97, 59, 10, 9,118,101, 99, 51, 32, 99, 59, 10, 10, 9, 99,109, 97,120, 32, 61, 32,109, 97,120, 40,114,103, 98, 91, 48,
- 93, 44, 32,109, 97,120, 40,114,103, 98, 91, 49, 93, 44, 32,114,103, 98, 91, 50, 93, 41, 41, 59, 10, 9, 99,109,105,110, 32, 61,
- 32,109,105,110, 40,114,103, 98, 91, 48, 93, 44, 32,109,105,110, 40,114,103, 98, 91, 49, 93, 44, 32,114,103, 98, 91, 50, 93, 41,
- 41, 59, 10, 9, 99,100,101,108,116, 97, 32, 61, 32, 99,109, 97,120, 45, 99,109,105,110, 59, 10, 10, 9,118, 32, 61, 32, 99,109,
- 97,120, 59, 10, 9,105,102, 32, 40, 99,109, 97,120, 33, 61, 48, 46, 48, 41, 10, 9, 9,115, 32, 61, 32, 99,100,101,108,116, 97,
- 47, 99,109, 97,120, 59, 10, 9,101,108,115,101, 32,123, 10, 9, 9,115, 32, 61, 32, 48, 46, 48, 59, 10, 9, 9,104, 32, 61, 32,
- 48, 46, 48, 59, 10, 9,125, 10, 10, 9,105,102, 32, 40,115, 32, 61, 61, 32, 48, 46, 48, 41, 32,123, 10, 9, 9,104, 32, 61, 32,
- 48, 46, 48, 59, 10, 9,125, 10, 9,101,108,115,101, 32,123, 10, 9, 9, 99, 32, 61, 32, 40,118,101, 99, 51, 40, 99,109, 97,120,
- 44, 32, 99,109, 97,120, 44, 32, 99,109, 97,120, 41, 32, 45, 32,114,103, 98, 46,120,121,122, 41, 47, 99,100,101,108,116, 97, 59,
- 10, 10, 9, 9,105,102, 32, 40,114,103, 98, 46,120, 61, 61, 99,109, 97,120, 41, 32,104, 32, 61, 32, 99, 91, 50, 93, 32, 45, 32,
- 99, 91, 49, 93, 59, 10, 9, 9,101,108,115,101, 32,105,102, 32, 40,114,103, 98, 46,121, 61, 61, 99,109, 97,120, 41, 32,104, 32,
- 61, 32, 50, 46, 48, 32, 43, 32, 99, 91, 48, 93, 32, 45, 32, 32, 99, 91, 50, 93, 59, 10, 9, 9,101,108,115,101, 32,104, 32, 61,
- 32, 52, 46, 48, 32, 43, 32, 99, 91, 49, 93, 32, 45, 32, 99, 91, 48, 93, 59, 10, 10, 9, 9,104, 32, 47, 61, 32, 54, 46, 48, 59,
- 10, 10, 9, 9,105,102, 32, 40,104, 60, 48, 46, 48, 41, 10, 9, 9, 9,104, 32, 43, 61, 32, 49, 46, 48, 59, 10, 9,125, 10, 10,
- 9,111,117,116, 99,111,108, 32, 61, 32,118,101, 99, 52, 40,104, 44, 32,115, 44, 32,118, 44, 32,114,103, 98, 46,119, 41, 59, 10,
-125, 10, 10,118,111,105,100, 32,104,115,118, 95,116,111, 95,114,103, 98, 40,118,101, 99, 52, 32,104,115,118, 44, 32,111,117,116,
- 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10, 9,102,108,111, 97,116, 32,105, 44, 32,102, 44, 32,112, 44, 32,
-113, 44, 32,116, 44, 32,104, 44, 32,115, 44, 32,118, 59, 10, 9,118,101, 99, 51, 32,114,103, 98, 59, 10, 10, 9,104, 32, 61, 32,
-104,115,118, 91, 48, 93, 59, 10, 9,115, 32, 61, 32,104,115,118, 91, 49, 93, 59, 10, 9,118, 32, 61, 32,104,115,118, 91, 50, 93,
- 59, 10, 10, 9,105,102, 40,115, 61, 61, 48, 46, 48, 41, 32,123, 10, 9, 9,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,118, 44,
- 32,118, 44, 32,118, 41, 59, 10, 9,125, 10, 9,101,108,115,101, 32,123, 10, 9, 9,105,102, 40,104, 61, 61, 49, 46, 48, 41, 10,
- 9, 9, 9,104, 32, 61, 32, 48, 46, 48, 59, 10, 9, 9, 10, 9, 9,104, 32, 42, 61, 32, 54, 46, 48, 59, 10, 9, 9,105, 32, 61,
- 32,102,108,111,111,114, 40,104, 41, 59, 10, 9, 9,102, 32, 61, 32,104, 32, 45, 32,105, 59, 10, 9, 9,114,103, 98, 32, 61, 32,
-118,101, 99, 51, 40,102, 44, 32,102, 44, 32,102, 41, 59, 10, 9, 9,112, 32, 61, 32,118, 42, 40, 49, 46, 48, 45,115, 41, 59, 10,
- 9, 9,113, 32, 61, 32,118, 42, 40, 49, 46, 48, 45, 40,115, 42,102, 41, 41, 59, 10, 9, 9,116, 32, 61, 32,118, 42, 40, 49, 46,
- 48, 45, 40,115, 42, 40, 49, 46, 48, 45,102, 41, 41, 41, 59, 10, 9, 9, 10, 9, 9,105,102, 32, 40,105, 32, 61, 61, 32, 48, 46,
- 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,118, 44, 32,116, 44, 32,112, 41, 59, 10, 9, 9,101,108,115,101, 32,105,
-102, 32, 40,105, 32, 61, 61, 32, 49, 46, 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,113, 44, 32,118, 44, 32,112, 41,
- 59, 10, 9, 9,101,108,115,101, 32,105,102, 32, 40,105, 32, 61, 61, 32, 50, 46, 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99,
- 51, 40,112, 44, 32,118, 44, 32,116, 41, 59, 10, 9, 9,101,108,115,101, 32,105,102, 32, 40,105, 32, 61, 61, 32, 51, 46, 48, 41,
- 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,112, 44, 32,113, 44, 32,118, 41, 59, 10, 9, 9,101,108,115,101, 32,105,102, 32,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list