diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-01-19 20:23:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-19 20:23:29 +0000 |
| commit | 2222fa5818324771ceb99fd8802e54a50a2fb1a4 (patch) | |
| tree | 1ae91df59da342959b75efa0a6bfa467038a78de /glslang/Include/glslang_c_interface.h | |
| parent | 3413ac75f77bea1fb8cc7f04fd83a62384e1d34e (diff) | |
| download | glslang-2222fa5818324771ceb99fd8802e54a50a2fb1a4.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-master' into..."ndk-r27-rc1ndk-r26dndk-r26cndk-r26bndk-r26-rc1ndk-r26-beta1ndk-r26ndk-r27-releasendk-r26-releasemaster-ndk
Revert submission 2388945-update-shaderc
Reason for revert: Breaks NDK build on darwin.
Reverted changes: /q/submissionid:2388945-update-shaderc
Change-Id: I7e65acd5f2a56fdd82f921a7cdce50e24c68e553
Diffstat (limited to 'glslang/Include/glslang_c_interface.h')
| -rw-r--r-- | glslang/Include/glslang_c_interface.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/glslang/Include/glslang_c_interface.h b/glslang/Include/glslang_c_interface.h index 28d52330..9e5608c5 100644 --- a/glslang/Include/glslang_c_interface.h +++ b/glslang/Include/glslang_c_interface.h @@ -157,13 +157,7 @@ typedef struct glslang_resource_s { int max_task_work_group_size_y_ext; int max_task_work_group_size_z_ext; int max_mesh_view_count_ext; - union - { - int max_dual_source_draw_buffers_ext; - - /* Incorrectly capitalized name retained for backward compatibility */ - int maxDualSourceDrawBuffersEXT; - }; + int maxDualSourceDrawBuffersEXT; glslang_limits_t limits; } glslang_resource_t; @@ -251,7 +245,6 @@ GLSLANG_EXPORT void glslang_finalize_process(); GLSLANG_EXPORT glslang_shader_t* glslang_shader_create(const glslang_input_t* input); GLSLANG_EXPORT void glslang_shader_delete(glslang_shader_t* shader); -GLSLANG_EXPORT void glslang_shader_set_preamble(glslang_shader_t* shader, const char* s); GLSLANG_EXPORT void glslang_shader_shift_binding(glslang_shader_t* shader, glslang_resource_type_t res, unsigned int base); GLSLANG_EXPORT void glslang_shader_shift_binding_for_set(glslang_shader_t* shader, glslang_resource_type_t res, unsigned int base, unsigned int set); GLSLANG_EXPORT void glslang_shader_set_options(glslang_shader_t* shader, int options); // glslang_shader_options_t |