Skip to content

Fixed the quatifier and label problem assocated with bake_spirv_by_sw… #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DominikWitczakAMD merged 2 commits into from
Aug 16, 2018
Merged

Fixed the quatifier and label problem assocated with bake_spirv_by_sw… #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b97e5fb
Fixed the quatifier and label problem assocated with bake_spirv_by_sw…
Aug 2, 2018
917da99
Moved the label to avoid gcc compiling problems
Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/misc/glsl_to_spirv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ namespace Anvil
EShLanguage get_glslang_shader_stage () const;
#else
bool bake_spirv_blob_by_spawning_glslang_process(const std::string& in_glsl_filename_with_path,
const std::string& in_spirv_filename_with_path);
const std::string& in_spirv_filename_with_path) const;
#endif

/* Private members */
Expand Down
10 changes: 8 additions & 2 deletions src/misc/glsl_to_spirv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,14 +553,19 @@ bool Anvil::GLSLShaderToSPIRVGenerator::bake_spirv_blob() const
result = bake_spirv_blob_by_calling_glslang(m_glsl_source_code.c_str() );
}
}

#else
{
/* We need to point glslangvalidator at a location where it can stash the SPIR-V blob. */
result = bake_spirv_blob_by_spawning_glslang_process(glsl_filename_with_path,
"temp.spv");
}

end:
#endif



return result;
}

Expand Down Expand Up @@ -722,12 +727,13 @@ bool Anvil::GLSLShaderToSPIRVGenerator::bake_spirv_blob() const
* @return true if successful, false otherwise.
**/
bool Anvil::GLSLShaderToSPIRVGenerator::bake_spirv_blob_by_spawning_glslang_process(const std::string& in_glsl_filename_with_path,
const std::string& in_spirv_filename_with_path)
const std::string& in_spirv_filename_with_path) const
{
auto callback_arg = OnGLSLToSPIRVConversionAboutToBeStartedCallbackArgument(this);
std::string glslangvalidator_params;
bool result = false;
size_t spirv_file_size = 0;
char* spirv_blob_ptr = nullptr;

callback(GLSL_SHADER_TO_SPIRV_GENERATOR_CALLBACK_ID_CONVERSION_ABOUT_TO_START,
&callback_arg);
Expand Down Expand Up @@ -818,7 +824,7 @@ bool Anvil::GLSLShaderToSPIRVGenerator::bake_spirv_blob() const
#endif

/* Now, read the SPIR-V file contents */
char* spirv_blob_ptr = nullptr;


Anvil::IO::read_file(in_spirv_filename_with_path.c_str(),
false, /* is_text_file */
Expand Down