summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-11-07 19:01:39 -0700
committerBrian Paul <[email protected]>2013-11-11 08:17:24 -0700
commita66a008b17872f3eab91b7d04dd70e4537bdb627 (patch)
tree1f0eeab4194f681efc7f70831884563a6bf39312
parent34ce1a850236b94186f73c24a7ddb0f18075eb94 (diff)
osmesa: fix broken triangle/line drawing when using float color buffer
Doesn't seem to help with bug 71363 but it fixed a failure I found in my testing. Cc: "9.2" <[email protected]> Cc: "10.0" <[email protected]>
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 102001edfa0..6f6f824b462 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -197,6 +197,14 @@ osmesa_choose_line_function( struct gl_context *ctx )
const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+ if (ctx->DrawBuffer &&
+ ctx->DrawBuffer->Visual.redBits == 32) {
+ /* the special-case line functions in this file don't work
+ * for float color channels.
+ */
+ return NULL;
+ }
+
if (ctx->RenderMode != GL_RENDER) return NULL;
if (ctx->Line.SmoothFlag) return NULL;
if (ctx->Texture._EnabledUnits) return NULL;
@@ -298,6 +306,14 @@ osmesa_choose_triangle_function( struct gl_context *ctx )
const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+ if (ctx->DrawBuffer &&
+ ctx->DrawBuffer->Visual.redBits == 32) {
+ /* the special-case triangle functions in this file don't work
+ * for float color channels.
+ */
+ return (swrast_tri_func) NULL;
+ }
+
if (ctx->RenderMode != GL_RENDER) return (swrast_tri_func) NULL;
if (ctx->Polygon.SmoothFlag) return (swrast_tri_func) NULL;
if (ctx->Polygon.StippleFlag) return (swrast_tri_func) NULL;