i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swrast: Remove old Mesa ifdef's

Browse Source
This commit is contained in:
Alexander von Gluck IV
2012-03-12 16:41:49 -05:00
parent 0b15050616
commit d36a2809d1
2 changed files with 1 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/opengl/swrast/MesaSoftwareRenderer.cpp
-46
View File
@@ -36,9 +36,7 @@ extern "C" {
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "swrast/swrast.h"
#if __GNUC__ > 2
#include "swrast/s_renderbuffer.h"
#endif
#include "swrast_setup/swrast_setup.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"
@@ -251,12 +249,8 @@ MesaSoftwareRenderer::MesaSoftwareRenderer(BGLView* view, ulong options,
functions.Flush = _Flush;
// create core context
#if HAIKU_MESA_VER <= 708
fContext = _mesa_create_context(fVisual, NULL, &functions, this);
#else
fContext = _mesa_create_context(API_OPENGL, fVisual, NULL,
&functions, this);
#endif
if (!fContext) {
ERROR("%s: Failed to create Mesa context!\n", __func__);
@@ -318,17 +312,9 @@ MesaSoftwareRenderer::MesaSoftwareRenderer(BGLView* view, ulong options,
&fBackRenderBuffer->base);
}
#if HAIKU_MESA_VER >= 709
// New Mesa
_swrast_add_soft_renderbuffers(&fFrameBuffer->base, GL_FALSE,
fVisual->haveDepthBuffer, fVisual->haveStencilBuffer,
fVisual->haveAccumBuffer, alphaFlag, GL_FALSE);
#else
// Old Mesa
_mesa_add_soft_renderbuffers(&fFrameBuffer->base, GL_FALSE,
fVisual->haveDepthBuffer, fVisual->haveStencilBuffer,
fVisual->haveAccumBuffer, alphaFlag, GL_FALSE);
#endif
BRect bounds = view->Bounds();
fWidth = fNewWidth = (GLint)bounds.Width();
@@ -725,9 +711,7 @@ MesaSoftwareRenderer::_FrontRenderbufferStorage(gl_context* ctx,
render->Data = NULL;
render->Width = width;
render->Height = height;
#if HAIKU_MESA_VER >= 712
render->RowStride = width;
#endif
return GL_TRUE;
}
@@ -814,30 +798,15 @@ MesaSoftwareRenderer::_SetupRenderBuffer(
buffer->base.GetValues = get_values_RGBA32;
buffer->base.PutRow = put_row_RGBA32;
buffer->base.PutValues = put_values_RGBA32;
#if HAIKU_MESA_VER <= 711
buffer->base.PutRowRGB = put_row_rgb_RGBA32;
buffer->base.PutMonoRow = put_mono_row_RGBA32;
buffer->base.PutMonoValues = put_values_RGBA32;
#endif
break;
case B_RGB32:
buffer->base._BaseFormat = GL_RGB;
#if HAIKU_MESA_VER >= 709
// XRGB8888 only in newer Mesa
buffer->base.Format = MESA_FORMAT_XRGB8888;
#else
buffer->base.Format = MESA_FORMAT_ARGB8888;
#endif
buffer->base.GetRow = get_row_RGB32;
buffer->base.GetValues = get_values_RGB32;
buffer->base.PutRow = put_row_RGB32;
buffer->base.PutValues = put_values_RGB32;
#if HAIKU_MESA_VER <= 711
buffer->base.PutRowRGB = put_row_rgb_RGB32;
buffer->base.PutMonoRow = put_mono_row_RGB32;
buffer->base.PutMonoValues = put_values_RGB32;
#endif
break;
case B_RGB24:
buffer->base._BaseFormat = GL_RGB;
@@ -847,11 +816,6 @@ MesaSoftwareRenderer::_SetupRenderBuffer(
buffer->base.GetValues = get_values_RGB24;
buffer->base.PutRow = put_row_RGB24;
buffer->base.PutValues = put_values_RGB24;
#if HAIKU_MESA_VER <= 711
buffer->base.PutRowRGB = put_row_rgb_RGB24;
buffer->base.PutMonoRow = put_mono_row_RGB24;
buffer->base.PutMonoValues = put_values_RGB24;
#endif
break;
case B_RGB16:
buffer->base._BaseFormat = GL_RGB;
@@ -861,11 +825,6 @@ MesaSoftwareRenderer::_SetupRenderBuffer(
buffer->base.GetValues = get_values_RGB16;
buffer->base.PutRow = put_row_RGB16;
buffer->base.PutValues = put_values_RGB16;
#if HAIKU_MESA_VER <= 711
buffer->base.PutRowRGB = put_row_rgb_RGB16;
buffer->base.PutMonoRow = put_mono_row_RGB16;
buffer->base.PutMonoValues = put_values_RGB16;
#endif
break;
case B_RGB15:
buffer->base._BaseFormat = GL_RGB;
@@ -875,11 +834,6 @@ MesaSoftwareRenderer::_SetupRenderBuffer(
buffer->base.GetValues = get_values_RGB15;
buffer->base.PutRow = put_row_RGB15;
buffer->base.PutValues = put_values_RGB15;
#if HAIKU_MESA_VER <= 711
buffer->base.PutRowRGB = put_row_rgb_RGB15;
buffer->base.PutMonoRow = put_mono_row_RGB15;
buffer->base.PutMonoValues = put_values_RGB15;
#endif
break;
default:
fprintf(stderr, "Unsupported screen color space %s\n",
src/add-ons/opengl/swrast/MesaSoftwareRenderer.h
+1 -12
View File
@@ -20,20 +20,9 @@
#include "GLRenderer.h"
extern "C" {
#include "main/version.h"
#define HAIKU_MESA_VER (MESA_MAJOR * 100) + MESA_MINOR
#include "context.h"
#if HAIKU_MESA_VER >= 712
#include "main/version.h"
#include "swrast/s_chan.h"
#endif
#if HAIKU_MESA_VER <= 711
#define gl_context GLcontext
#define gl_config GLvisual
#endif
struct msr_renderbuffer {