projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop GLcontext typedef and use struct gl_context instead
[mesa.git]
/
src
/
mesa
/
drivers
/
windows
/
gldirect
/
dx9
/
gld_driver_dx9.c
diff --git
a/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
b/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
index 0186b268324b561fcee93849162fd9a652b0846b..aab708520165a6084f914344ef6e2310ec3f6b62 100644
(file)
--- a/
src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
+++ b/
src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
@@
-69,7
+69,7
@@
const float _fPersp_33 = 1.6f;
//---------------------------------------------------------------------------
void _gld_mesa_warning(
//---------------------------------------------------------------------------
void _gld_mesa_warning(
- __
GL
context *gc,
+ __
struct gl_
context *gc,
char *str)
{
// Intercept Mesa's internal warning mechanism
char *str)
{
// Intercept Mesa's internal warning mechanism
@@
-79,7
+79,7
@@
void _gld_mesa_warning(
//---------------------------------------------------------------------------
void _gld_mesa_fatal(
//---------------------------------------------------------------------------
void _gld_mesa_fatal(
- __
GL
context *gc,
+ __
struct gl_
context *gc,
char *str)
{
// Intercept Mesa's internal fatal-message mechanism
char *str)
{
// Intercept Mesa's internal fatal-message mechanism
@@
-199,7
+199,7
@@
D3DBLEND _gldConvertBlendFunc(
//---------------------------------------------------------------------------
void gld_Noop_DX9(
//---------------------------------------------------------------------------
void gld_Noop_DX9(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
#ifdef _DEBUG
gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
{
#ifdef _DEBUG
gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
@@
-209,7
+209,7
@@
void gld_Noop_DX9(
//---------------------------------------------------------------------------
void gld_Error_DX9(
//---------------------------------------------------------------------------
void gld_Error_DX9(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
#ifdef _DEBUG
// Quite useless.
{
#ifdef _DEBUG
// Quite useless.
@@
-222,7
+222,7
@@
void gld_Error_DX9(
//---------------------------------------------------------------------------
static GLboolean gld_set_draw_buffer_DX9(
//---------------------------------------------------------------------------
static GLboolean gld_set_draw_buffer_DX9(
-
GL
context *ctx,
+
struct gl_
context *ctx,
GLenum mode)
{
(void) ctx;
GLenum mode)
{
(void) ctx;
@@
-237,7
+237,7
@@
static GLboolean gld_set_draw_buffer_DX9(
//---------------------------------------------------------------------------
static void gld_set_read_buffer_DX9(
//---------------------------------------------------------------------------
static void gld_set_read_buffer_DX9(
-
GL
context *ctx,
+
struct gl_
context *ctx,
struct gl_framebuffer *buffer,
GLenum mode)
{
struct gl_framebuffer *buffer,
GLenum mode)
{
@@
-251,7
+251,7
@@
static void gld_set_read_buffer_DX9(
//---------------------------------------------------------------------------
void gld_Clear_DX9(
//---------------------------------------------------------------------------
void gld_Clear_DX9(
-
GL
context *ctx,
+
struct gl_
context *ctx,
GLbitfield mask,
GLboolean all,
GLint x,
GLbitfield mask,
GLboolean all,
GLint x,
@@
-340,7
+340,7
@@
void gld_Clear_DX9(
// Mesa 5: Parameter change
static void gld_buffer_size_DX9(
// Mesa 5: Parameter change
static void gld_buffer_size_DX9(
-//
GL
context *ctx,
+//
struct gl_
context *ctx,
struct gl_framebuffer *fb,
GLuint *width,
GLuint *height)
struct gl_framebuffer *fb,
GLuint *width,
GLuint *height)
@@
-354,14
+354,14
@@
static void gld_buffer_size_DX9(
//---------------------------------------------------------------------------
static void gld_Finish_DX9(
//---------------------------------------------------------------------------
static void gld_Finish_DX9(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
}
//---------------------------------------------------------------------------
static void gld_Flush_DX9(
{
}
//---------------------------------------------------------------------------
static void gld_Flush_DX9(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gld = GLD_GET_CONTEXT(ctx);
{
GLD_context *gld = GLD_GET_CONTEXT(ctx);
@@
-377,7
+377,7
@@
static void gld_Flush_DX9(
//---------------------------------------------------------------------------
void gld_NEW_STENCIL(
//---------------------------------------------------------------------------
void gld_NEW_STENCIL(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-402,7
+402,7
@@
void gld_NEW_STENCIL(
//---------------------------------------------------------------------------
void gld_NEW_COLOR(
//---------------------------------------------------------------------------
void gld_NEW_COLOR(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-434,7
+434,7
@@
void gld_NEW_COLOR(
//---------------------------------------------------------------------------
void gld_NEW_DEPTH(
//---------------------------------------------------------------------------
void gld_NEW_DEPTH(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-447,7
+447,7
@@
void gld_NEW_DEPTH(
//---------------------------------------------------------------------------
void gld_NEW_POLYGON(
//---------------------------------------------------------------------------
void gld_NEW_POLYGON(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-513,7
+513,7
@@
void gld_NEW_POLYGON(
//---------------------------------------------------------------------------
void gld_NEW_FOG(
//---------------------------------------------------------------------------
void gld_NEW_FOG(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-568,7
+568,7
@@
void gld_NEW_FOG(
//---------------------------------------------------------------------------
void gld_NEW_LIGHT(
//---------------------------------------------------------------------------
void gld_NEW_LIGHT(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-588,7
+588,7
@@
void gld_NEW_LIGHT(
//---------------------------------------------------------------------------
void gld_NEW_MODELVIEW(
//---------------------------------------------------------------------------
void gld_NEW_MODELVIEW(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-620,7
+620,7
@@
void gld_NEW_MODELVIEW(
//---------------------------------------------------------------------------
void gld_NEW_PROJECTION(
//---------------------------------------------------------------------------
void gld_NEW_PROJECTION(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-699,7
+699,7
@@
void gldOrthoHook_DX9(
//---------------------------------------------------------------------------
void gld_NEW_VIEWPORT(
//---------------------------------------------------------------------------
void gld_NEW_VIEWPORT(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-741,7
+741,7
@@
void gld_NEW_VIEWPORT(
//---------------------------------------------------------------------------
void gld_NEW_SCISSOR(
//---------------------------------------------------------------------------
void gld_NEW_SCISSOR(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
@@
-768,7
+768,7
@@
void gld_NEW_SCISSOR(
//---------------------------------------------------------------------------
__inline BOOL _gldAnyEvalEnabled(
//---------------------------------------------------------------------------
__inline BOOL _gldAnyEvalEnabled(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
struct gl_eval_attrib *eval = &ctx->Eval;
{
struct gl_eval_attrib *eval = &ctx->Eval;
@@
-800,7
+800,7
@@
__inline BOOL _gldAnyEvalEnabled(
//---------------------------------------------------------------------------
BOOL _gldChooseInternalPipeline(
//---------------------------------------------------------------------------
BOOL _gldChooseInternalPipeline(
-
GL
context *ctx,
+
struct gl_
context *ctx,
GLD_driver_dx9 *gld)
{
// return TRUE; // DEBUGGING: ALWAYS USE MESA
GLD_driver_dx9 *gld)
{
// return TRUE; // DEBUGGING: ALWAYS USE MESA
@@
-864,7
+864,7
@@
BOOL _gldChooseInternalPipeline(
//---------------------------------------------------------------------------
void gld_update_state_DX9(
//---------------------------------------------------------------------------
void gld_update_state_DX9(
-
GL
context *ctx,
+
struct gl_
context *ctx,
GLuint new_state)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLuint new_state)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
@@
-1001,7
+1001,7
@@
void gld_update_state_DX9(
//---------------------------------------------------------------------------
void gld_Viewport_DX9(
//---------------------------------------------------------------------------
void gld_Viewport_DX9(
-
GL
context *ctx,
+
struct gl_
context *ctx,
GLint x,
GLint y,
GLsizei w,
GLint x,
GLint y,
GLsizei w,
@@
-1063,11
+1063,11
@@
void gld_Viewport_DX9(
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
-extern BOOL dglWglResizeBuffers(
GL
context *ctx, BOOL bDefaultDriver);
+extern BOOL dglWglResizeBuffers(
struct gl_
context *ctx, BOOL bDefaultDriver);
// Mesa 5: Parameter change
void gldResizeBuffers_DX9(
// Mesa 5: Parameter change
void gldResizeBuffers_DX9(
-//
GL
context *ctx)
+//
struct gl_
context *ctx)
struct gl_framebuffer *fb)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_framebuffer *fb)
{
GET_CURRENT_CONTEXT(ctx);
@@
-1079,7
+1079,7
@@
void gldResizeBuffers_DX9(
// This is only for debugging.
// To use, plug into ctx->Driver.Enable pointer below.
void gld_Enable(
// This is only for debugging.
// To use, plug into ctx->Driver.Enable pointer below.
void gld_Enable(
-
GL
context *ctx,
+
struct gl_
context *ctx,
GLenum e,
GLboolean b)
{
GLenum e,
GLboolean b)
{
@@
-1092,10
+1092,10
@@
void gld_Enable(
// Driver pointer setup
//---------------------------------------------------------------------------
// Driver pointer setup
//---------------------------------------------------------------------------
-extern const GLubyte* _gldGetStringGeneric(
GL
context*, GLenum);
+extern const GLubyte* _gldGetStringGeneric(
struct gl_
context*, GLenum);
void gldSetupDriverPointers_DX9(
void gldSetupDriverPointers_DX9(
-
GL
context *ctx)
+
struct gl_
context *ctx)
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);
{
GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
GLD_driver_dx9 *gld = GLD_GET_DX9_DRIVER(gldCtx);