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

mesa: Whitespace, style cleanup. No functional change

Browse Source
This commit is contained in:
Alexander von Gluck IV
2012-01-12 18:04:34 -06:00
parent 0c99c75edf
commit 58dbd25f6b
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
+22 -21
View File
@@ -15,14 +15,15 @@
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*/ */
#include "MesaSoftwareRenderer.h" #include "MesaSoftwareRenderer.h"
#include <stdio.h>
#include <string.h>
#include <Autolock.h> #include <Autolock.h>
#include <DirectWindowPrivate.h> #include <DirectWindowPrivate.h>
#include <GraphicsDefs.h> #include <GraphicsDefs.h>
#include <Screen.h> #include <Screen.h>
#include <stdio.h>
#include <string.h>
extern "C" { extern "C" {
#include "extensions.h" #include "extensions.h"
@@ -56,28 +57,28 @@ extern "C" {
#endif #endif
} }
extern const char* color_space_name(color_space space); extern const char* color_space_name(color_space space);
// BeOS component ordering for B_RGBA32 bitmap format // BeOS component ordering for B_RGBA32 bitmap format
#if B_HOST_IS_LENDIAN #if B_HOST_IS_LENDIAN
#define BE_RCOMP 2 #define BE_RCOMP 2
#define BE_GCOMP 1 #define BE_GCOMP 1
#define BE_BCOMP 0 #define BE_BCOMP 0
#define BE_ACOMP 3 #define BE_ACOMP 3
#else #else
// Big Endian B_RGBA32 bitmap format // Big Endian B_RGBA32 bitmap format
#define BE_RCOMP 1 #define BE_RCOMP 1
#define BE_GCOMP 2 #define BE_GCOMP 2
#define BE_BCOMP 3 #define BE_BCOMP 3
#define BE_ACOMP 0 #define BE_ACOMP 0
#endif #endif
/**********************************************************************/ /**********************************************************************/
/***** Read/write spans/arrays of pixels *****/ /***** Read/write spans/arrays of pixels *****/
/**********************************************************************/ /**********************************************************************/
extern "C" { extern "C" {
/* 32-bit RGBA */ /* 32-bit RGBA */
@@ -89,20 +90,20 @@ extern "C" {
GLubyte* P = ((GLubyte**)mr->GetRows())[Y] + (X) * 4 GLubyte* P = ((GLubyte**)mr->GetRows())[Y] + (X) * 4
#define INC_PIXEL_PTR(P) P += 4 #define INC_PIXEL_PTR(P) P += 4
#define STORE_PIXEL(DST, X, Y, VALUE) \ #define STORE_PIXEL(DST, X, Y, VALUE) \
DST[BE_RCOMP] = VALUE[RCOMP]; \ DST[BE_RCOMP] = VALUE[RCOMP]; \
DST[BE_GCOMP] = VALUE[GCOMP]; \ DST[BE_GCOMP] = VALUE[GCOMP]; \
DST[BE_BCOMP] = VALUE[BCOMP]; \ DST[BE_BCOMP] = VALUE[BCOMP]; \
DST[BE_ACOMP] = VALUE[ACOMP] DST[BE_ACOMP] = VALUE[ACOMP]
#define STORE_PIXEL_RGB(DST, X, Y, VALUE) \ #define STORE_PIXEL_RGB(DST, X, Y, VALUE) \
DST[BE_RCOMP] = VALUE[RCOMP]; \ DST[BE_RCOMP] = VALUE[RCOMP]; \
DST[BE_GCOMP] = VALUE[GCOMP]; \ DST[BE_GCOMP] = VALUE[GCOMP]; \
DST[BE_BCOMP] = VALUE[BCOMP]; \ DST[BE_BCOMP] = VALUE[BCOMP]; \
DST[BE_ACOMP] = 255 DST[BE_ACOMP] = 255
#define FETCH_PIXEL(DST, SRC) \ #define FETCH_PIXEL(DST, SRC) \
DST[RCOMP] = SRC[BE_RCOMP]; \ DST[RCOMP] = SRC[BE_RCOMP]; \
DST[GCOMP] = SRC[BE_GCOMP]; \ DST[GCOMP] = SRC[BE_GCOMP]; \
DST[BCOMP] = SRC[BE_BCOMP]; \ DST[BCOMP] = SRC[BE_BCOMP]; \
DST[ACOMP] = SRC[BE_ACOMP] DST[ACOMP] = SRC[BE_ACOMP]
#include "swrast/s_spantemp.h" #include "swrast/s_spantemp.h"
/* 32-bit RGB */ /* 32-bit RGB */
@@ -115,8 +116,8 @@ extern "C" {
#define INC_PIXEL_PTR(P) P += 1 #define INC_PIXEL_PTR(P) P += 1
#define STORE_PIXEL(DST, X, Y, VALUE) \ #define STORE_PIXEL(DST, X, Y, VALUE) \
*DST = ( ((VALUE[RCOMP]) << 16) | \ *DST = ( ((VALUE[RCOMP]) << 16) | \
((VALUE[GCOMP]) << 8) | \ ((VALUE[GCOMP]) << 8) | \
((VALUE[BCOMP]) ) ) ((VALUE[BCOMP]) ) )
#define FETCH_PIXEL(DST, SRC) \ #define FETCH_PIXEL(DST, SRC) \
DST[RCOMP] = ((*SRC & 0x00ff0000) >> 16); \ DST[RCOMP] = ((*SRC & 0x00ff0000) >> 16); \
DST[GCOMP] = ((*SRC & 0x0000ff00) >> 8); \ DST[GCOMP] = ((*SRC & 0x0000ff00) >> 8); \
@@ -166,7 +167,7 @@ extern "C" {
#define NAME(PREFIX) PREFIX##_RGB15 #define NAME(PREFIX) PREFIX##_RGB15
#define RB_TYPE GLubyte #define RB_TYPE GLubyte
#define SPAN_VARS \ #define SPAN_VARS \
MesaSoftwareRenderer* mr = (MesaSoftwareRenderer*)ctx->DriverCtx; MesaSoftwareRenderer* mr = (MesaSoftwareRenderer*)ctx->DriverCtx;
#define INIT_PIXEL_PTR(P, X, Y) \ #define INIT_PIXEL_PTR(P, X, Y) \
GLushort* P = (GLushort*)(((GLubyte**)mr->GetRows())[Y] + (X) * 2) GLushort* P = (GLushort*)(((GLubyte**)mr->GetRows())[Y] + (X) * 2)
#define INC_PIXEL_PTR(P) P += 1 #define INC_PIXEL_PTR(P) P += 1
@@ -423,7 +424,7 @@ MesaSoftwareRenderer::SwapBuffers(bool VSync)
GLView()->UnlockLooper(); GLView()->UnlockLooper();
} }
} else { } else {
// TODO: Here the BGLView needs to be drawlocked. // TODO: Here the BGLView needs to be drawlocked.
_CopyToDirect(); _CopyToDirect();
} }