blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Gawain: add (temp) legacy GLSL support to ShaderInterface 

A temporary measure needed by GPU_basic_shader.

Part of T51164
This commit is contained in:
Mike Erwin 2017-04-12 18:03:18 -04:00
parent 02fd9a1aaf
commit c61b7b0263
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
intern/gawain/src/shader_interface.c
View File

@ -14,6 +14,7 @@
#include <stddef.h>
#include <string.h>
#define SUPPORT_LEGACY_GLSL 1
#define DEBUG_SHADER_INTERFACE 0
#if DEBUG_SHADER_INTERFACE
@ -92,17 +93,23 @@ ShaderInterface* ShaderInterface_create(GLint program)
input->location = glGetUniformLocation(program, name);
#if TRUST_NO_ONE
assert(input->location != -1);
#if SUPPORT_LEGACY_GLSL
if (input->location != -1)
{
#elif TRUST_NO_ONE
assert(input->location != -1);
#endif
if (setup_builtin_uniform(input, name))
; // reclaim space from name buffer (don't advance offset)
else
{
input->name = name;
name_buffer_offset += name_len + 1; // include NULL terminator
if (setup_builtin_uniform(input, name))
; // reclaim space from name buffer (don't advance offset)
else
{
input->name = name;
name_buffer_offset += name_len + 1; // include NULL terminator
}
#if SUPPORT_LEGACY_GLSL
}
#endif
#if DEBUG_SHADER_INTERFACE
printf("uniform[%u] '%s' at location %d\n", i, name, input->location);
@ -122,12 +129,18 @@ ShaderInterface* ShaderInterface_create(GLint program)
input->location = glGetAttribLocation(program, name);
#if TRUST_NO_ONE
assert(input->location != -1);
#if SUPPORT_LEGACY_GLSL
if (input->location != -1)
{
#elif TRUST_NO_ONE
assert(input->location != -1);
#endif
input->name = name;
name_buffer_offset += name_len + 1; // include NULL terminator
input->name = name;
name_buffer_offset += name_len + 1; // include NULL terminator
#if SUPPORT_LEGACY_GLSL
}
#endif
#if DEBUG_SHADER_INTERFACE
printf("attrib[%u] '%s' at location %d\n", i, name, input->location);
@ -157,6 +170,10 @@ const ShaderInput* ShaderInterface_uniform(const ShaderInterface* shaderface, co
{
const ShaderInput* uniform = shaderface->inputs + i;
#if SUPPORT_LEGACY_GLSL
if (uniform->name == NULL) continue;
#endif
if (strcmp(uniform->name, name) == 0)
return uniform;
}