diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-01 11:58:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-01 11:58:08 +0200 |
| commit | 458ea020a211b25c00c1de9e30e4434213b55f47 (patch) | |
| tree | 86ce7ba4b2cc9a655d270a877202e129dcca6df3 /mesalib/src/mesa/drivers/common/meta.c | |
| parent | 6d46609dfd488f9433d0ed10f49d05e31a6fe51e (diff) | |
| parent | 28d1f604563d9c738a4c5630364d0e6b4e9b13ff (diff) | |
| download | vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.tar.gz vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.tar.bz2 vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 1 Jul 2013
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.c')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index f7dd06aeb..e8484299b 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -615,18 +615,16 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) _mesa_set_enable(ctx, GL_FRAGMENT_SHADER_ATI, GL_FALSE); } - if (ctx->Extensions.ARB_shader_objects) { - _mesa_reference_shader_program(ctx, &save->VertexShader, - ctx->Shader.CurrentVertexProgram); - _mesa_reference_shader_program(ctx, &save->GeometryShader, - ctx->Shader.CurrentGeometryProgram); - _mesa_reference_shader_program(ctx, &save->FragmentShader, - ctx->Shader.CurrentFragmentProgram); - _mesa_reference_shader_program(ctx, &save->ActiveShader, - ctx->Shader.ActiveProgram); - - _mesa_UseProgram(0); - } + _mesa_reference_shader_program(ctx, &save->VertexShader, + ctx->Shader.CurrentVertexProgram); + _mesa_reference_shader_program(ctx, &save->GeometryShader, + ctx->Shader.CurrentGeometryProgram); + _mesa_reference_shader_program(ctx, &save->FragmentShader, + ctx->Shader.CurrentFragmentProgram); + _mesa_reference_shader_program(ctx, &save->ActiveShader, + ctx->Shader.ActiveProgram); + + _mesa_UseProgram(0); } if (state & MESA_META_STENCIL_TEST) { @@ -3049,12 +3047,6 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, GLenum status; /* check for fallbacks */ - if (!ctx->Extensions.EXT_framebuffer_object) { - _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH, - "glGenerateMipmap() without FBOs\n"); - return GL_TRUE; - } - if (target == GL_TEXTURE_3D || target == GL_TEXTURE_1D_ARRAY || target == GL_TEXTURE_2D_ARRAY) { |