diff options
| author | Brian Paul <[email protected]> | 2014-03-08 18:06:30 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-03-10 17:07:05 -0600 |
| commit | 7d5903980ed7c4405e20dbc4f5ade9d202c559cb (patch) | |
| tree | f3a138a1cca5229434da9fc703d468498263c4ce /src/mesa/drivers/common/meta_blit.c | |
| parent | d96ed5c088157f36661e4dbe37b5058cc6790052 (diff) | |
meta: use non-ARB shader/program create/delete functions
The non-ARB versions take GLuint ids, not GLhandleARB.
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common/meta_blit.c')
| -rw-r--r-- | src/mesa/drivers/common/meta_blit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 907c2cdf326..31e494fb846 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -325,11 +325,11 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx, vs = _mesa_meta_compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_source); fs = _mesa_meta_compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_source); - blit->msaa_shaders[shader_index] = _mesa_CreateProgramObjectARB(); + blit->msaa_shaders[shader_index] = _mesa_CreateProgram(); _mesa_AttachShader(blit->msaa_shaders[shader_index], fs); - _mesa_DeleteObjectARB(fs); + _mesa_DeleteShader(fs); _mesa_AttachShader(blit->msaa_shaders[shader_index], vs); - _mesa_DeleteObjectARB(vs); + _mesa_DeleteShader(vs); _mesa_BindAttribLocation(blit->msaa_shaders[shader_index], 0, "position"); _mesa_BindAttribLocation(blit->msaa_shaders[shader_index], 1, "texcoords"); _mesa_meta_link_program_with_debug(ctx, blit->msaa_shaders[shader_index]); |