From 9526f0a88153f2f88e3226af9b8cfbd2609074f3 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 12 Mar 2012 14:43:43 -0500 Subject: [PATCH] swrasts: Fix indirect rendering regression * Introduced in hrev43755 * Missed the fact this fb width and height was still used. * Haiku3d, and flurry work once again --- src/add-ons/opengl/swrast/MesaSoftwareRenderer.cpp | 2 ++ src/add-ons/opengl/swrast_legacy/MesaSoftwareRenderer.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/add-ons/opengl/swrast/MesaSoftwareRenderer.cpp b/src/add-ons/opengl/swrast/MesaSoftwareRenderer.cpp index 4596902e30..385d89f164 100644 --- a/src/add-ons/opengl/swrast/MesaSoftwareRenderer.cpp +++ b/src/add-ons/opengl/swrast/MesaSoftwareRenderer.cpp @@ -595,6 +595,8 @@ MesaSoftwareRenderer::_AllocateBitmap() fFrontRenderBuffer->size = fBitmap->BitsLength(); if (fVisual->doubleBufferMode) fBackRenderBuffer->size = fBitmap->BitsLength(); + fFrameBuffer->width = fWidth; + fFrameBuffer->height = fHeight; TRACE("%s: Bitmap Size: %" B_PRIu32 "\n", __func__, fBitmap->BitsLength()); fFrontRenderBuffer->base.Data = fBitmap->Bits(); diff --git a/src/add-ons/opengl/swrast_legacy/MesaSoftwareRenderer.cpp b/src/add-ons/opengl/swrast_legacy/MesaSoftwareRenderer.cpp index 4596902e30..385d89f164 100644 --- a/src/add-ons/opengl/swrast_legacy/MesaSoftwareRenderer.cpp +++ b/src/add-ons/opengl/swrast_legacy/MesaSoftwareRenderer.cpp @@ -595,6 +595,8 @@ MesaSoftwareRenderer::_AllocateBitmap() fFrontRenderBuffer->size = fBitmap->BitsLength(); if (fVisual->doubleBufferMode) fBackRenderBuffer->size = fBitmap->BitsLength(); + fFrameBuffer->width = fWidth; + fFrameBuffer->height = fHeight; TRACE("%s: Bitmap Size: %" B_PRIu32 "\n", __func__, fBitmap->BitsLength()); fFrontRenderBuffer->base.Data = fBitmap->Bits();