Mesa (master): wgl: More symbol naming normalization.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Apr 9 14:22:19 UTC 2009
Module: Mesa
Branch: master
Commit: 8ef412900363aa6338351001574867866ebcae89
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ef412900363aa6338351001574867866ebcae89
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Apr 9 11:44:33 2009 +0100
wgl: More symbol naming normalization.
---
src/gallium/state_trackers/wgl/icd/stw_icd.h | 6 ++--
.../state_trackers/wgl/shared/stw_arbpixelformat.c | 8 +++---
.../state_trackers/wgl/shared/stw_context.c | 4 +-
.../state_trackers/wgl/shared/stw_pixelformat.c | 28 ++++++++++----------
.../state_trackers/wgl/shared/stw_pixelformat.h | 4 +-
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.h b/src/gallium/state_trackers/wgl/icd/stw_icd.h
index 8e676fb..cbc1a66 100644
--- a/src/gallium/state_trackers/wgl/icd/stw_icd.h
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.h
@@ -25,8 +25,8 @@
*
**************************************************************************/
-#ifndef DRV_H
-#define DRV_H
+#ifndef STW_ICD_H
+#define STW_ICD_H
#include <windows.h>
@@ -486,4 +486,4 @@ BOOL APIENTRY
DrvValidateVersion(
ULONG ulVersion );
-#endif /* DRV_H */
+#endif /* STW_ICD_H */
diff --git a/src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c b/src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c
index c4795ce..a4f78cb 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_arbpixelformat.c
@@ -89,7 +89,7 @@ stw_query_attrib(
return TRUE;
case WGL_SWAP_METHOD_ARB:
- if (pf->flags & PF_FLAG_DOUBLEBUFFER)
+ if (pf->flags & STW_PF_FLAG_DOUBLEBUFFER)
*pvalue = WGL_SWAP_COPY_ARB;
else
*pvalue = WGL_SWAP_UNDEFINED_ARB;
@@ -142,7 +142,7 @@ stw_query_attrib(
break;
case WGL_DOUBLE_BUFFER_ARB:
- if (pf->flags & PF_FLAG_DOUBLEBUFFER)
+ if (pf->flags & STW_PF_FLAG_DOUBLEBUFFER)
*pvalue = TRUE;
else
*pvalue = FALSE;
@@ -213,14 +213,14 @@ stw_query_attrib(
break;
case WGL_SAMPLE_BUFFERS_ARB:
- if (pf->flags & PF_FLAG_MULTISAMPLED)
+ if (pf->flags & STW_PF_FLAG_MULTISAMPLED)
*pvalue = stw_query_sample_buffers();
else
*pvalue = 0;
break;
case WGL_SAMPLES_ARB:
- if (pf->flags & PF_FLAG_MULTISAMPLED)
+ if (pf->flags & STW_PF_FLAG_MULTISAMPLED)
*pvalue = stw_query_samples();
else
*pvalue = 0;
diff --git a/src/gallium/state_trackers/wgl/shared/stw_context.c b/src/gallium/state_trackers/wgl/shared/stw_context.c
index 5c9f7c8..f01151b 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_context.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_context.c
@@ -110,7 +110,7 @@ stw_create_layer_context(
*/
visual = _mesa_create_visual(
GL_TRUE,
- (pf->flags & PF_FLAG_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE,
+ (pf->flags & STW_PF_FLAG_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE,
GL_FALSE,
pf->color.redbits,
pf->color.greenbits,
@@ -123,7 +123,7 @@ stw_create_layer_context(
0,
0,
0,
- (pf->flags & PF_FLAG_MULTISAMPLED) ? stw_query_samples() : 0 );
+ (pf->flags & STW_PF_FLAG_MULTISAMPLED) ? stw_query_samples() : 0 );
if (visual == NULL)
goto fail;
diff --git a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c
index a7e8363..7e49889 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.c
@@ -32,13 +32,13 @@
#define STW_MAX_PIXELFORMATS 16
-static struct stw_pixelformat_info pixelformats[STW_MAX_PIXELFORMATS];
+static struct stw_pixelformat_info stw_pixelformats[STW_MAX_PIXELFORMATS];
static uint stw_pixelformat_count = 0;
static uint stw_pixelformat_extended_count = 0;
static void
-add_standard_pixelformats(
+stw_add_standard_pixelformats(
struct stw_pixelformat_info **ppf,
uint flags )
{
@@ -49,25 +49,25 @@ add_standard_pixelformats(
struct stw_pixelformat_depth_info depth24s8 = { 24, 8 };
struct stw_pixelformat_depth_info depth16 = { 16, 0 };
- pf->flags = PF_FLAG_DOUBLEBUFFER | flags;
+ pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = alpha8;
pf->depth = depth16;
pf++;
- pf->flags = PF_FLAG_DOUBLEBUFFER | flags;
+ pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = alpha8;
pf->depth = depth24s8;
pf++;
- pf->flags = PF_FLAG_DOUBLEBUFFER | flags;
+ pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = noalpha;
pf->depth = depth16;
pf++;
- pf->flags = PF_FLAG_DOUBLEBUFFER | flags;
+ pf->flags = STW_PF_FLAG_DOUBLEBUFFER | flags;
pf->color = color24;
pf->alpha = noalpha;
pf->depth = depth24s8;
@@ -103,13 +103,13 @@ add_standard_pixelformats(
void
stw_pixelformat_init( void )
{
- struct stw_pixelformat_info *pf = pixelformats;
+ struct stw_pixelformat_info *pf = stw_pixelformats;
- add_standard_pixelformats( &pf, 0 );
- stw_pixelformat_count = pf - pixelformats;
+ stw_add_standard_pixelformats( &pf, 0 );
+ stw_pixelformat_count = pf - stw_pixelformats;
- add_standard_pixelformats( &pf, PF_FLAG_MULTISAMPLED );
- stw_pixelformat_extended_count = pf - pixelformats;
+ stw_add_standard_pixelformats( &pf, STW_PF_FLAG_MULTISAMPLED );
+ stw_pixelformat_extended_count = pf - stw_pixelformats;
assert( stw_pixelformat_extended_count <= STW_MAX_PIXELFORMATS );
}
@@ -131,7 +131,7 @@ stw_pixelformat_get_info( uint index )
{
assert( index < stw_pixelformat_extended_count );
- return &pixelformats[index];
+ return &stw_pixelformats[index];
}
@@ -161,7 +161,7 @@ stw_pixelformat_describe(
ppfd->nSize = sizeof( PIXELFORMATDESCRIPTOR );
ppfd->nVersion = 1;
ppfd->dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
- if (pf->flags & PF_FLAG_DOUBLEBUFFER)
+ if (pf->flags & STW_PF_FLAG_DOUBLEBUFFER)
ppfd->dwFlags |= PFD_DOUBLEBUFFER | PFD_SWAP_COPY;
ppfd->iPixelType = PFD_TYPE_RGBA;
ppfd->cColorBits = pf->color.redbits + pf->color.greenbits + pf->color.bluebits;
@@ -213,7 +213,7 @@ int stw_pixelformat_choose( HDC hdc,
if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) &&
!!(ppfd->dwFlags & PFD_DOUBLEBUFFER) !=
- !!(pf->flags & PF_FLAG_DOUBLEBUFFER))
+ !!(pf->flags & STW_PF_FLAG_DOUBLEBUFFER))
continue;
if (ppfd->cColorBits != pf->color.redbits + pf->color.greenbits + pf->color.bluebits)
diff --git a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
index 926c9c9..cdf687c 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
@@ -31,8 +31,8 @@
#include <windows.h>
#include "pipe/p_compiler.h"
-#define PF_FLAG_DOUBLEBUFFER 0x00000001
-#define PF_FLAG_MULTISAMPLED 0x00000002
+#define STW_PF_FLAG_DOUBLEBUFFER 0x00000001
+#define STW_PF_FLAG_MULTISAMPLED 0x00000002
struct stw_pixelformat_color_info
{
More information about the mesa-commit
mailing list