mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2092 from corporateshark/master

Browse Source 
Fix for #2075: removed DefaultTBuiltInResource from glslang_c_interface.cpp
This commit is contained in:
John Kessenich 2020-02-28 00:26:33 -07:00 committed by GitHub
commit f13d38f3cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glslang/CInterface/glslang_c_interface.cpp
View File

@ -350,15 +350,19 @@ const char* glslang_shader_get_preprocessed_code(glslang_shader_t* shader)
return shader->preprocessedGLSL.c_str(); return shader->preprocessedGLSL.c_str();
} }
int glslang_shader_preprocess(glslang_shader_t* shader, const glslang_input_t* i) int glslang_shader_preprocess(glslang_shader_t* shader, const glslang_input_t* input)
{ {
DirStackFileIncluder Includer; DirStackFileIncluder Includer;
/* TODO: use custom callbacks if they are available in 'i->callbacks' */ /* TODO: use custom callbacks if they are available in 'i->callbacks' */
return shader->shader->preprocess( return shader->shader->preprocess(
/* No user-defined resources limit */ input->resource,
&glslang::DefaultTBuiltInResource, i->default_version, c_shader_profile(i->default_profile), input->default_version,
i->force_default_version_and_profile != 0, i->forward_compatible != 0, c_shader_profile(input->default_profile),
(EShMessages)c_shader_messages(i->messages), &shader->preprocessedGLSL, Includer input->force_default_version_and_profile != 0,
input->forward_compatible != 0,
(EShMessages)c_shader_messages(input->messages),
&shader->preprocessedGLSL,
Includer
); );
} }
@ -368,9 +372,11 @@ int glslang_shader_parse(glslang_shader_t* shader, const glslang_input_t* input)
shader->shader->setStrings(&preprocessedCStr, 1); shader->shader->setStrings(&preprocessedCStr, 1);
return shader->shader->parse( return shader->shader->parse(
/* No user-defined resource limits for now */ input->resource,
&glslang::DefaultTBuiltInResource, input->default_version, input->forward_compatible != 0, input->default_version,
(EShMessages)c_shader_messages(input->messages)); input->forward_compatible != 0,
(EShMessages)c_shader_messages(input->messages)
);
} }
const char* glslang_shader_get_info_log(glslang_shader_t* shader) { return shader->shader->getInfoLog(); } const char* glslang_shader_get_info_log(glslang_shader_t* shader) { return shader->shader->getInfoLog(); }

2
glslang/Include/glslang_c_interface.h
View File

@ -39,6 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
typedef struct glslang_shader_s glslang_shader_t; typedef struct glslang_shader_s glslang_shader_t;
typedef struct glslang_program_s glslang_program_t; typedef struct glslang_program_s glslang_program_t;
typedef struct TBuiltInResource glslang_resource_t;
typedef struct glslang_input_s { typedef struct glslang_input_s {
glslang_source_t language; glslang_source_t language;
@ -54,6 +55,7 @@ typedef struct glslang_input_s {
int force_default_version_and_profile; int force_default_version_and_profile;
int forward_compatible; int forward_compatible;
glslang_messages_t messages; glslang_messages_t messages;
const glslang_resource_t* resource;
} glslang_input_t; } glslang_input_t;
/* Inclusion result structure allocated by C include_local/include_system callbacks */ /* Inclusion result structure allocated by C include_local/include_system callbacks */