archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPUShader: Add GPU_VERTEX/FRAGMENT/GEOMETRY_SHADER defines

Browse Source 
This makes it possible to have some code specific to each shader inside a
shader library.
This commit is contained in:
Clément Foucault
2019-01-21 12:50:57 +01:00
parent f8d040cb70
commit ba4de7f1a5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/gpu/intern/gpu_shader.c
View File

@@ -361,7 +361,7 @@ GPUShader *GPU_shader_create_ex(
#endif
/* At least a vertex shader and a fragment shader are required. */
// BLI_assert((fragcode != NULL) && (vertexcode != NULL));
BLI_assert((fragcode != NULL) && (vertexcode != NULL));
if (vertexcode)
shader->vertex = glCreateShader(GL_VERTEX_SHADER);
@@ -386,11 +386,12 @@ GPUShader *GPU_shader_create_ex(
gpu_shader_standard_extensions(standard_extensions);
if (vertexcode) {
const char *source[5];
const char *source[6];
/* custom limit, may be too small, beware */
int num_source = 0;
source[num_source++] = gpu_shader_version();
source[num_source++] = "#define GPU_VERTEX_SHADER\n";
source[num_source++] = standard_extensions;
source[num_source++] = standard_defines;
@@ -419,6 +420,7 @@ GPUShader *GPU_shader_create_ex(
int num_source = 0;
source[num_source++] = gpu_shader_version();
source[num_source++] = "#define GPU_FRAGMENT_SHADER\n";
source[num_source++] = standard_extensions;
source[num_source++] = standard_defines;
@@ -448,6 +450,7 @@ GPUShader *GPU_shader_create_ex(
int num_source = 0;
source[num_source++] = gpu_shader_version();
source[num_source++] = "#define GPU_GEOMETRY_SHADER\n";
source[num_source++] = standard_extensions;
source[num_source++] = standard_defines;