griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #34788, #34744: GLSL error, #version line needs to be at the top of the shader

Browse Source 
and this wasn't the case anymore after recent changes.
This commit is contained in:
Brecht Van Lommel
2013-04-02 16:37:31 +00:00
parent 5c74e6dae2
commit 0aada35e93
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/intern/gpu_codegen.c
View File

@@ -680,12 +680,6 @@ void GPU_code_generate_glsl_lib(void)
ds = BLI_dynstr_new();
if (GPU_bicubic_bump_support()) {
BLI_dynstr_append(ds, "/* These are needed for high quality bump mapping */\n"
"#version 130\n"
"#extension GL_ARB_texture_query_lod: enable\n"
"#define BUMP_BICUBIC\n");
}
BLI_dynstr_append(ds, datatoc_gpu_shader_material_glsl);

18
source/blender/gpu/intern/gpu_extensions.c
View File

@@ -1136,6 +1136,18 @@ static void shader_print_errors(const char *task, char *log, const char *code)
fprintf(stderr, "%s\n", log);
}
static const char *gpu_shader_standard_extensions(void)
{
/* need this extensions for high quality bump mapping */
if(GPU_bicubic_bump_support()) {
return "#version 130\n"
"#extension GL_ARB_texture_query_lod: enable\n"
"#define BUMP_BICUBIC\n";
}
return "";
}
static const char *gpu_shader_standard_defines(void)
{
/* some useful defines to detect GPU type */
@@ -1177,9 +1189,10 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const
}
if (vertexcode) {
const char *source[3];
const char *source[4];
int num_source = 0;
source[num_source++] = gpu_shader_standard_extensions();
source[num_source++] = gpu_shader_standard_defines();
if (defines) source[num_source++] = defines;
@@ -1201,9 +1214,10 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const
}
if (fragcode) {
const char *source[4];
const char *source[5];
int num_source = 0;
source[num_source++] = gpu_shader_standard_extensions();
source[num_source++] = gpu_shader_standard_defines();
if (defines) source[num_source++] = defines;