diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | build_files/cmake/data_to_c.cmake | 25 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 40 | ||||
| -rw-r--r-- | source/blender/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/compositor/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 2 | ||||
| -rw-r--r-- | source/blender/datatoc/CMakeLists.txt | 29 | ||||
| -rw-r--r-- | source/blender/datatoc/datatoc.c | 120 |
8 files changed, 172 insertions, 50 deletions
diff --git a/SConstruct b/SConstruct index 7a662640a37..7e6bcdf8747 100644 --- a/SConstruct +++ b/SConstruct @@ -496,7 +496,7 @@ def data_to_c_simple(FILE_FROM): data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl", B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h", - "clkernelstoh_COM_OpenCLKernels_cl") + "datatoc_COM_OpenCLKernels_cl") data_to_c_simple("release/datafiles/startup.blend") data_to_c_simple("release/datafiles/preview.blend") diff --git a/build_files/cmake/data_to_c.cmake b/build_files/cmake/data_to_c.cmake deleted file mode 100644 index b8b18269dc8..00000000000 --- a/build_files/cmake/data_to_c.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# cmake script, to be called on its own with 3 defined args -# -# - FILE_FROM -# - FILE_TO -# - VAR_NAME - -# not highly optimal, may replace with generated C program like makesdna -file(READ ${FILE_FROM} file_from_string HEX) -string(LENGTH ${file_from_string} _max_index) -math(EXPR size_on_disk ${_max_index}/2) - -file(REMOVE ${FILE_TO}) - -file(APPEND ${FILE_TO} "int ${VAR_NAME}_size = ${size_on_disk};\n") -file(APPEND ${FILE_TO} "char ${VAR_NAME}[] = {") - -set(_index 0) - -while(NOT _index EQUAL _max_index) - string(SUBSTRING "${file_from_string}" ${_index} 2 _pair) - file(APPEND ${FILE_TO} "0x${_pair},") - math(EXPR _index ${_index}+2) -endwhile() -# null terminator not essential but good if we want plane strings encoded -file(APPEND ${FILE_TO} "0x00};\n") diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index af122541ae5..3d2d19c7685 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -729,19 +729,21 @@ endmacro() # TODO, create a C binary and call it instead!, doing this in cmake its slow macro(data_to_c - file_from file_to var_name + file_from file_to list_to_add) list(APPEND ${list_to_add} ${file_to}) + get_filename_component(_file_to_path ${file_to} PATH) + add_custom_command( OUTPUT ${file_to} - COMMAND ${CMAKE_COMMAND} - -DFILE_FROM=${file_from} - -DFILE_TO=${file_to} - -DVAR_NAME=${var_name} - -P ${CMAKE_SOURCE_DIR}/build_files/cmake/data_to_c.cmake + COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path} + COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc + ${file_from} + ${file_to} DEPENDS ${file_from}) + unset(_file_to_path) endmacro() # same as above but generates the var name and output automatic. @@ -749,26 +751,22 @@ macro(data_to_c_simple file_from list_to_add) - # get var name automatic from name - get_filename_component(_file_from_only ${file_from} NAME) - string(REPLACE "." "_" _file_from_only ${_file_from_only}) - set(_var_name "datatoc_${_file_from_only}") - - # only to avoid confusion - set(_file_to ${file_from}.c) + # only to avoid confusion + set(_file_to ${file_from}.c) list(APPEND ${list_to_add} ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}) + get_filename_component(_file_to_path ${_file_to} PATH) + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_to} - COMMAND ${CMAKE_COMMAND} - -DFILE_FROM=${CMAKE_CURRENT_SOURCE_DIR}/${file_from} - -DFILE_TO=${CMAKE_CURRENT_BINARY_DIR}/${_file_to} - -DVAR_NAME=${_var_name} - -P ${CMAKE_SOURCE_DIR}/build_files/cmake/data_to_c.cmake + COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path} + COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc + ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} + ${CMAKE_CURRENT_BINARY_DIR}/${_file_to} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}) - unset(_file_from_only) - unset(_var_name) - unset(_file_to) + unset(_var_name) + unset(_file_to) + unset(_file_to_path) endmacro() diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 3c756668578..92785804b01 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -89,6 +89,7 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h ) +add_subdirectory(datatoc) add_subdirectory(editors) add_subdirectory(windowmanager) add_subdirectory(blenkernel) diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 9c31e19442e..65d46bf515a 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -644,7 +644,6 @@ list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}/operations ) data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl - ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h - clkernelstoh_COM_OpenCLKernels_cl SRC) + ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC) blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 8c42b05edca..6b32645c48b 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -288,7 +288,7 @@ void WorkScheduler::initialize() g_context = clCreateContext(NULL, numberOfDevices, cldevices, clContextError, NULL, &error); if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); } - const char *cl_str[2] = {clkernelstoh_COM_OpenCLKernels_cl, NULL}; + const char *cl_str[2] = {datatoc_COM_OpenCLKernels_cl, NULL}; g_program = clCreateProgramWithSource(g_context, 1, cl_str, 0, &error); error = clBuildProgram(g_program, numberOfDevices, cldevices, 0, 0, 0); if (error != CL_SUCCESS) { diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt new file mode 100644 index 00000000000..125e653ee5c --- /dev/null +++ b/source/blender/datatoc/CMakeLists.txt @@ -0,0 +1,29 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public LicenseS +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Contributor(s): Campbell Barton. +# +# ***** END GPL LICENSE BLOCK ***** + + +# ----------------------------------------------------------------------------- +# Build makesdna executable +set(SRC + datatoc.c +) + +# SRC_DNA_INC is defined in the parent dir +add_executable(datatoc ${SRC}) diff --git a/source/blender/datatoc/datatoc.c b/source/blender/datatoc/datatoc.c new file mode 100644 index 00000000000..7a4e51932a2 --- /dev/null +++ b/source/blender/datatoc/datatoc.c @@ -0,0 +1,120 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +/* #define VERBOSE */ + +#define MAX2(x, y) ( (x) > (y) ? (x) : (y) ) +#define MAX3(x, y, z) MAX2(MAX2((x), (y)), (z) ) + +static char *basename(char *string) +{ + char *lfslash, *lbslash; + + lfslash = strrchr(string, '/'); + lbslash = strrchr(string, '\\'); + if (lbslash) lbslash++; + if (lfslash) lfslash++; + + return MAX3(string, lfslash, lbslash); +} + +int main(int argc, char **argv) +{ + FILE *fpin, *fpout; + char sizest[256]; + long size; + int i; + + if (argc < 2) { + printf("Usage: datatoc <data_file_from> <data_file_to>\n"); + exit(1); + } + + fpin = fopen(argv[1], "rb"); + if (!fpin) { + printf("Unable to open input <%s>\n", argv[1]); + exit(1); + } + + argv[1] = basename(argv[1]); + + fseek(fpin, 0L, SEEK_END); + size = ftell(fpin); + fseek(fpin, 0L, SEEK_SET); + + if (argv[1][0] == '.') argv[1]++; + +#ifdef VERBOSE + printf("Making C file <%s>\n", argv[2]); +#endif + + for (i = 0; i < (int)strlen(argv[1]); i++) + if (argv[1][i] == '.') argv[1][i] = '_'; + + sprintf(sizest, "%d", (int)size); + +#ifdef VERBOSE + printf("Input filesize is %d, Output size should be %d\n", + (int)size, + (int)(((int)size) * 4 + + strlen("/* DataToC output of file <> */\n\n") + + strlen("char datatoc_[] = {\"") + + strlen("\"};\n") + + (strlen(argv[1]) * 3) + + strlen(sizest) + + strlen("int datatoc__size = ;\n") + + (((int)(size / 256) + 1) * 5))); +#endif + + fpout = fopen(argv[2], "w"); + if (!fpout) { + fprintf(stderr, "Unable to open output <%s>\n", argv[2]); + exit(1); + } + + fprintf(fpout, "/* DataToC output of file <%s> */\n\n", argv[1]); + fprintf(fpout, "int datatoc_%s_size = %s;\n", argv[1], sizest); + fprintf(fpout, "char datatoc_%s[] = {\n", argv[1]); + while (size--) { + if (size % 32 == 31) { + fprintf(fpout, "\n"); + } + + /* fprintf (fpout, "\\x%02x", getc(fpin)); */ + fprintf(fpout, "%3d,", getc(fpin)); + } + + fprintf(fpout, "\n};\n\n"); + + fclose(fpin); + fclose(fpout); + return 0; +} |