[Mesa-dev] [PATCH] meta: Don't try to glOrtho when the draw buffer isn't initialized.
Brian Paul
brianp at vmware.com
Tue Nov 27 07:27:51 PST 2012
On 11/26/2012 10:11 PM, Kenneth Graunke wrote:
> I ran across this while running a glGenerateMipmap() test.
>
> _meta_GenerateMipmap sets MESA_META_TRANSFORM, which causes
> _mesa_meta_begin to try and set a default orthographic projection.
>
> Unfortunately, if the drawbuffer isn't set up, ctx->DrawBuffer->Width
> and Height are 0, which just causes an GL_INVALID_VALUE error.
>
> Fixes oglconform's fbo/mipmap.automatic, mipmap.manual, and
> mipmap.manualIterateTexTargets.
>
> Signed-off-by: Kenneth Graunke<kenneth at whitecape.org>
> ---
> src/mesa/drivers/common/meta.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
> index 417dbd0..7d58281 100644
> --- a/src/mesa/drivers/common/meta.c
> +++ b/src/mesa/drivers/common/meta.c
> @@ -684,9 +684,11 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
> _mesa_LoadIdentity();
> _mesa_MatrixMode(GL_PROJECTION);
> _mesa_LoadIdentity();
> - _mesa_Ortho(0.0, ctx->DrawBuffer->Width,
> - 0.0, ctx->DrawBuffer->Height,
> - -1.0, 1.0);
> + if (ctx->DrawBuffer->Initialized) {
> + _mesa_Ortho(0.0, ctx->DrawBuffer->Width,
> + 0.0, ctx->DrawBuffer->Height,
> + -1.0, 1.0);
> + }
> }
>
> if (state& MESA_META_CLIP) {
Reviewed-by: Brian Paul <brianp at vmware.com>
More information about the mesa-dev
mailing list