From 363fc6d64fc8b813f2216b8b28414c6a2c6d2963 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 12 Mar 2009 14:14:58 -0600 Subject: [PATCH] mesa: fix glRead/DrawBuffer(GL_AUXn) error value If GL_AUX[123] are passed to glRead/DrawBuffer() when those buffers don't exist, need to generate GL_INVALID_OPERATION, not GL_INVALID_ENUM. This regression came from commit 555f0a88182e2b1af809b2d97abdac02814a2f28 --- src/mesa/main/buffers.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 1580487..c5f1334 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -119,6 +119,10 @@ draw_buffer_enum_to_bitmask(GLenum buffer) return BUFFER_BIT_FRONT_LEFT; case GL_AUX0: return BUFFER_BIT_AUX0; + case GL_AUX1: + case GL_AUX2: + case GL_AUX3: + return 1 << BUFFER_COUNT; /* invalid, but not BAD_MASK */ case GL_COLOR_ATTACHMENT0_EXT: return BUFFER_BIT_COLOR0; case GL_COLOR_ATTACHMENT1_EXT: @@ -170,6 +174,10 @@ read_buffer_enum_to_index(GLenum buffer) return BUFFER_FRONT_LEFT; case GL_AUX0: return BUFFER_AUX0; + case GL_AUX1: + case GL_AUX2: + case GL_AUX3: + return BUFFER_COUNT; /* invalid, but not -1 */ case GL_COLOR_ATTACHMENT0_EXT: return BUFFER_COLOR0; case GL_COLOR_ATTACHMENT1_EXT: -- 2.7.4