From c4a6176d197f3b45e8ba95afa1ad37e0fc5aad6f Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 4 Nov 2022 09:45:10 -0700 Subject: [PATCH] mesa: Create _mesa_CreateShaderProgramv_impl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Factor out the implementation of _mesa_CreateShaderProgramv so that we can make programs that will encode DXT5. Reviewed-by: Tapani Pälli Part-of: --- src/mesa/main/shaderapi.c | 20 +++++++++++++++----- src/mesa/main/shaderapi.h | 4 ++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 048106dccd5..bce384fa539 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2671,12 +2671,11 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, /** * ARB_separate_shader_objects: Compile & Link Program */ -GLuint GLAPIENTRY -_mesa_CreateShaderProgramv(GLenum type, GLsizei count, - const GLchar* const *strings) +GLuint +_mesa_CreateShaderProgramv_impl(struct gl_context *ctx, + GLenum type, GLsizei count, + const GLchar* const *strings) { - GET_CURRENT_CONTEXT(ctx); - const GLuint shader = create_shader_err(ctx, type, "glCreateShaderProgramv"); GLuint program = 0; @@ -2728,6 +2727,17 @@ _mesa_CreateShaderProgramv(GLenum type, GLsizei count, return program; } +/** + * ARB_separate_shader_objects: Compile & Link Program + */ +GLuint GLAPIENTRY +_mesa_CreateShaderProgramv(GLenum type, GLsizei count, + const GLchar* const *strings) +{ + GET_CURRENT_CONTEXT(ctx); + + return _mesa_CreateShaderProgramv_impl(ctx, type, count, strings); +} static void set_patch_vertices(struct gl_context *ctx, GLint value) diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 678757404a2..35177d42f64 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -200,6 +200,10 @@ const char * _mesa_lookup_shader_include(struct gl_context *ctx, char *path, bool error_check); +GLuint +_mesa_CreateShaderProgramv_impl(struct gl_context *ctx, + GLenum type, GLsizei count, + const GLchar* const *strings); #ifdef __cplusplus } #endif