diff options
Diffstat (limited to 'src/mesa/drivers/common')
-rw-r--r-- | src/mesa/drivers/common/meta.c | 12 | ||||
-rw-r--r-- | src/mesa/drivers/common/meta.h | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 6dcbc8bdfd8..3c86305d77f 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -121,14 +121,14 @@ _mesa_meta_framebuffer_texture_image(struct gl_context *ctx, level, layer, false, __func__); } -struct gl_shader * -_mesa_meta_compile_shader_with_debug(struct gl_context *ctx, GLenum target, - const GLcharARB *source) +static struct gl_shader * +meta_compile_shader_with_debug(struct gl_context *ctx, gl_shader_stage stage, + const GLcharARB *source) { const GLuint name = ~0; struct gl_shader *sh; - sh = ctx->Driver.NewShader(ctx, name, target); + sh = ctx->Driver.NewShader(ctx, name, stage); sh->Source = strdup(source); sh->CompileStatus = false; _mesa_compile_shader(ctx, sh); @@ -183,9 +183,9 @@ _mesa_meta_compile_and_link_program(struct gl_context *ctx, sh_prog->NumShaders = 2; sh_prog->Shaders = malloc(2 * sizeof(struct gl_shader *)); sh_prog->Shaders[0] = - _mesa_meta_compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_source); + meta_compile_shader_with_debug(ctx, MESA_SHADER_VERTEX, vs_source); sh_prog->Shaders[1] = - _mesa_meta_compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_source); + meta_compile_shader_with_debug(ctx, MESA_SHADER_FRAGMENT, fs_source); _mesa_meta_link_program_with_debug(ctx, sh_prog); diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 0a7321c9d88..ba83a6dc21b 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -577,11 +577,6 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, void _mesa_meta_drawbuffers_from_bitfield(GLbitfield bits); -struct gl_shader * -_mesa_meta_compile_shader_with_debug(struct gl_context *ctx, GLenum target, - const GLcharARB *source); - - void _mesa_meta_link_program_with_debug(struct gl_context *ctx, struct gl_shader_program *sh_prog); |