diff options
author | marha <marha@users.sourceforge.net> | 2014-03-12 16:40:50 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-03-12 16:40:50 +0100 |
commit | cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914 (patch) | |
tree | c0863bb0ad967459374ace6668bf2e80e1f9b004 /mesalib/src/mesa/drivers/common/meta_blit.c | |
parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
download | vcxsrv-cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914.tar.gz vcxsrv-cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914.tar.bz2 vcxsrv-cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914.zip |
mesa xserver xkbcomp git update 12 Mar 2014
xserver commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4
xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18
mesa commit 2c886eba7820f7e3e965dd16b786b0a412d8ef11
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta_blit.c')
-rw-r--r-- | mesalib/src/mesa/drivers/common/meta_blit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta_blit.c b/mesalib/src/mesa/drivers/common/meta_blit.c index 907c2cdf3..31e494fb8 100644 --- a/mesalib/src/mesa/drivers/common/meta_blit.c +++ b/mesalib/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]); |