KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: indent -br -i3 -npcs --no-tabs single2.c

This commit is contained in:
RALOVICH, Kristóf 2008-10-13 14:35:18 +02:00 committed by Alan Hourihane
parent 750f497713
commit ee88fff432
1 changed files with 668 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/glx/x11/single2.c
View File

@ -38,7 +38,8 @@
#include "indirect_vertex_array.h" #include "indirect_vertex_array.h"
/* Used for GL_ARB_transpose_matrix */ /* Used for GL_ARB_transpose_matrix */
static void TransposeMatrixf(GLfloat m[16]) static void
TransposeMatrixf(GLfloat m[16])
{ {
int i, j; int i, j;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -51,7 +52,8 @@ static void TransposeMatrixf(GLfloat m[16])
} }
/* Used for GL_ARB_transpose_matrix */ /* Used for GL_ARB_transpose_matrix */
static void TransposeMatrixb(GLboolean m[16]) static void
TransposeMatrixb(GLboolean m[16])
{ {
int i, j; int i, j;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -64,7 +66,8 @@ static void TransposeMatrixb(GLboolean m[16])
} }
/* Used for GL_ARB_transpose_matrix */ /* Used for GL_ARB_transpose_matrix */
static void TransposeMatrixd(GLdouble m[16]) static void
TransposeMatrixd(GLdouble m[16])
{ {
int i, j; int i, j;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -77,7 +80,8 @@ static void TransposeMatrixd(GLdouble m[16])
} }
/* Used for GL_ARB_transpose_matrix */ /* Used for GL_ARB_transpose_matrix */
static void TransposeMatrixi(GLint m[16]) static void
TransposeMatrixi(GLint m[16])
{ {
int i, j; int i, j;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -110,7 +114,8 @@ RemapTransposeEnum( GLenum e )
} }
GLenum __indirect_glGetError(void) GLenum
__indirect_glGetError(void)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
GLuint retval = GL_NO_ERROR; GLuint retval = GL_NO_ERROR;
@ -210,16 +215,20 @@ get_client_data( __GLXcontext * gc, GLenum cap, GLintptr * data )
break; break;
case GL_TEXTURE_COORD_ARRAY: case GL_TEXTURE_COORD_ARRAY:
retval = __glXGetArrayEnable( state, GL_TEXTURE_COORD_ARRAY, tex_unit, data ); retval =
__glXGetArrayEnable(state, GL_TEXTURE_COORD_ARRAY, tex_unit, data);
break; break;
case GL_TEXTURE_COORD_ARRAY_SIZE: case GL_TEXTURE_COORD_ARRAY_SIZE:
retval = __glXGetArraySize( state, GL_TEXTURE_COORD_ARRAY, tex_unit, data ); retval =
__glXGetArraySize(state, GL_TEXTURE_COORD_ARRAY, tex_unit, data);
break; break;
case GL_TEXTURE_COORD_ARRAY_TYPE: case GL_TEXTURE_COORD_ARRAY_TYPE:
retval = __glXGetArrayType( state, GL_TEXTURE_COORD_ARRAY, tex_unit, data ); retval =
__glXGetArrayType(state, GL_TEXTURE_COORD_ARRAY, tex_unit, data);
break; break;
case GL_TEXTURE_COORD_ARRAY_STRIDE: case GL_TEXTURE_COORD_ARRAY_STRIDE:
retval = __glXGetArrayStride( state, GL_TEXTURE_COORD_ARRAY, tex_unit, data ); retval =
__glXGetArrayStride(state, GL_TEXTURE_COORD_ARRAY, tex_unit, data);
break; break;
case GL_MAX_ELEMENTS_VERTICES: case GL_MAX_ELEMENTS_VERTICES:
@ -297,7 +306,8 @@ get_client_data( __GLXcontext * gc, GLenum cap, GLintptr * data )
} }
void __indirect_glGetBooleanv(GLenum val, GLboolean *b) void
__indirect_glGetBooleanv(GLenum val, GLboolean * b)
{ {
const GLenum origVal = val; const GLenum origVal = val;
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
@ -315,7 +325,8 @@ void __indirect_glGetBooleanv(GLenum val, GLboolean *b)
/* /*
** Error occured; don't modify user's buffer. ** Error occured; don't modify user's buffer.
*/ */
} else { }
else {
GLintptr data; GLintptr data;
/* /*
@ -333,7 +344,8 @@ void __indirect_glGetBooleanv(GLenum val, GLboolean *b)
*/ */
if (compsize == 1) { if (compsize == 1) {
__GLX_SINGLE_GET_CHAR(b); __GLX_SINGLE_GET_CHAR(b);
} else { }
else {
__GLX_SINGLE_GET_CHAR_ARRAY(b, compsize); __GLX_SINGLE_GET_CHAR_ARRAY(b, compsize);
if (val != origVal) { if (val != origVal) {
/* matrix transpose */ /* matrix transpose */
@ -345,7 +357,8 @@ void __indirect_glGetBooleanv(GLenum val, GLboolean *b)
__GLX_SINGLE_END(); __GLX_SINGLE_END();
} }
void __indirect_glGetDoublev(GLenum val, GLdouble *d) void
__indirect_glGetDoublev(GLenum val, GLdouble * d)
{ {
const GLenum origVal = val; const GLenum origVal = val;
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
@ -363,7 +376,8 @@ void __indirect_glGetDoublev(GLenum val, GLdouble *d)
/* /*
** Error occured; don't modify user's buffer. ** Error occured; don't modify user's buffer.
*/ */
} else { }
else {
GLintptr data; GLintptr data;
/* /*
@ -381,7 +395,8 @@ void __indirect_glGetDoublev(GLenum val, GLdouble *d)
*/ */
if (compsize == 1) { if (compsize == 1) {
__GLX_SINGLE_GET_DOUBLE(d); __GLX_SINGLE_GET_DOUBLE(d);
} else { }
else {
__GLX_SINGLE_GET_DOUBLE_ARRAY(d, compsize); __GLX_SINGLE_GET_DOUBLE_ARRAY(d, compsize);
if (val != origVal) { if (val != origVal) {
/* matrix transpose */ /* matrix transpose */
@ -393,7 +408,8 @@ void __indirect_glGetDoublev(GLenum val, GLdouble *d)
__GLX_SINGLE_END(); __GLX_SINGLE_END();
} }
void __indirect_glGetFloatv(GLenum val, GLfloat *f) void
__indirect_glGetFloatv(GLenum val, GLfloat * f)
{ {
const GLenum origVal = val; const GLenum origVal = val;
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
@ -411,7 +427,8 @@ void __indirect_glGetFloatv(GLenum val, GLfloat *f)
/* /*
** Error occured; don't modify user's buffer. ** Error occured; don't modify user's buffer.
*/ */
} else { }
else {
GLintptr data; GLintptr data;
/* /*
@ -429,7 +446,8 @@ void __indirect_glGetFloatv(GLenum val, GLfloat *f)
*/ */
if (compsize == 1) { if (compsize == 1) {
__GLX_SINGLE_GET_FLOAT(f); __GLX_SINGLE_GET_FLOAT(f);
} else { }
else {
__GLX_SINGLE_GET_FLOAT_ARRAY(f, compsize); __GLX_SINGLE_GET_FLOAT_ARRAY(f, compsize);
if (val != origVal) { if (val != origVal) {
/* matrix transpose */ /* matrix transpose */
@ -441,7 +459,8 @@ void __indirect_glGetFloatv(GLenum val, GLfloat *f)
__GLX_SINGLE_END(); __GLX_SINGLE_END();
} }
void __indirect_glGetIntegerv(GLenum val, GLint *i) void
__indirect_glGetIntegerv(GLenum val, GLint * i)
{ {
const GLenum origVal = val; const GLenum origVal = val;
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
@ -459,7 +478,8 @@ void __indirect_glGetIntegerv(GLenum val, GLint *i)
/* /*
** Error occured; don't modify user's buffer. ** Error occured; don't modify user's buffer.
*/ */
} else { }
else {
GLintptr data; GLintptr data;
/* /*
@ -477,7 +497,8 @@ void __indirect_glGetIntegerv(GLenum val, GLint *i)
*/ */
if (compsize == 1) { if (compsize == 1) {
__GLX_SINGLE_GET_LONG(i); __GLX_SINGLE_GET_LONG(i);
} else { }
else {
__GLX_SINGLE_GET_LONG_ARRAY(i, compsize); __GLX_SINGLE_GET_LONG_ARRAY(i, compsize);
if (val != origVal) { if (val != origVal) {
/* matrix transpose */ /* matrix transpose */
@ -492,11 +513,13 @@ void __indirect_glGetIntegerv(GLenum val, GLint *i)
/* /*
** Send all pending commands to server. ** Send all pending commands to server.
*/ */
void __indirect_glFlush(void) void
__indirect_glFlush(void)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
if (!dpy) return; if (!dpy)
return;
__GLX_SINGLE_LOAD_VARIABLES(); __GLX_SINGLE_LOAD_VARIABLES();
__GLX_SINGLE_BEGIN(X_GLsop_Flush, 0); __GLX_SINGLE_BEGIN(X_GLsop_Flush, 0);
@ -506,11 +529,13 @@ void __indirect_glFlush(void)
XFlush(dpy); XFlush(dpy);
} }
void __indirect_glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer) void
__indirect_glFeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
if (!dpy) return; if (!dpy)
return;
__GLX_SINGLE_LOAD_VARIABLES(); __GLX_SINGLE_LOAD_VARIABLES();
__GLX_SINGLE_BEGIN(X_GLsop_FeedbackBuffer, 8); __GLX_SINGLE_BEGIN(X_GLsop_FeedbackBuffer, 8);
@ -521,11 +546,13 @@ void __indirect_glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
gc->feedbackBuf = buffer; gc->feedbackBuf = buffer;
} }
void __indirect_glSelectBuffer(GLsizei numnames, GLuint *buffer) void
__indirect_glSelectBuffer(GLsizei numnames, GLuint * buffer)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
if (!dpy) return; if (!dpy)
return;
__GLX_SINGLE_LOAD_VARIABLES(); __GLX_SINGLE_LOAD_VARIABLES();
__GLX_SINGLE_BEGIN(X_GLsop_SelectBuffer, 4); __GLX_SINGLE_BEGIN(X_GLsop_SelectBuffer, 4);
@ -535,13 +562,15 @@ void __indirect_glSelectBuffer(GLsizei numnames, GLuint *buffer)
gc->selectBuf = buffer; gc->selectBuf = buffer;
} }
GLint __indirect_glRenderMode(GLenum mode) GLint
__indirect_glRenderMode(GLenum mode)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
GLint retval = 0; GLint retval = 0;
xGLXRenderModeReply reply; xGLXRenderModeReply reply;
if (!dpy) return -1; if (!dpy)
return -1;
__GLX_SINGLE_LOAD_VARIABLES(); __GLX_SINGLE_LOAD_VARIABLES();
__GLX_SINGLE_BEGIN(X_GLsop_RenderMode, 4); __GLX_SINGLE_BEGIN(X_GLsop_RenderMode, 4);
@ -555,13 +584,14 @@ GLint __indirect_glRenderMode(GLenum mode)
** occured. When an error happens the server won't send us any ** occured. When an error happens the server won't send us any
** other data. ** other data.
*/ */
} else { }
else {
/* Read the feedback or selection data */ /* Read the feedback or selection data */
if (gc->renderMode == GL_FEEDBACK) { if (gc->renderMode == GL_FEEDBACK) {
__GLX_SINGLE_GET_SIZE(compsize); __GLX_SINGLE_GET_SIZE(compsize);
__GLX_SINGLE_GET_FLOAT_ARRAY(gc->feedbackBuf, compsize); __GLX_SINGLE_GET_FLOAT_ARRAY(gc->feedbackBuf, compsize);
} else }
if (gc->renderMode == GL_SELECT) { else if (gc->renderMode == GL_SELECT) {
__GLX_SINGLE_GET_SIZE(compsize); __GLX_SINGLE_GET_SIZE(compsize);
__GLX_SINGLE_GET_LONG_ARRAY(gc->selectBuf, compsize); __GLX_SINGLE_GET_LONG_ARRAY(gc->selectBuf, compsize);
} }
@ -572,7 +602,8 @@ GLint __indirect_glRenderMode(GLenum mode)
return retval; return retval;
} }
void __indirect_glFinish(void) void
__indirect_glFinish(void)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply; xGLXSingleReply reply;
@ -588,8 +619,7 @@ void __indirect_glFinish(void)
* Extract the major and minor version numbers from a version string. * Extract the major and minor version numbers from a version string.
*/ */
static void static void
version_from_string( const char * ver, version_from_string(const char *ver, int *major_version, int *minor_version)
int * major_version, int * minor_version )
{ {
const char *end; const char *end;
long major; long major;
@ -602,29 +632,35 @@ version_from_string( const char * ver,
} }
const GLubyte *__indirect_glGetString(GLenum name) const GLubyte *
__indirect_glGetString(GLenum name)
{ {
__GLXcontext *gc = __glXGetCurrentContext(); __GLXcontext *gc = __glXGetCurrentContext();
Display *dpy = gc->currentDpy; Display *dpy = gc->currentDpy;
GLubyte *s = NULL; GLubyte *s = NULL;
if (!dpy) return 0; if (!dpy)
return 0;
/* /*
** Return the cached copy if the string has already been fetched ** Return the cached copy if the string has already been fetched
*/ */
switch (name) { switch (name) {
case GL_VENDOR: case GL_VENDOR:
if (gc->vendor) return gc->vendor; if (gc->vendor)
return gc->vendor;
break; break;
case GL_RENDERER: case GL_RENDERER:
if (gc->renderer) return gc->renderer; if (gc->renderer)
return gc->renderer;
break; break;
case GL_VERSION: case GL_VERSION:
if (gc->version) return gc->version; if (gc->version)
return gc->version;
break; break;
case GL_EXTENSIONS: case GL_EXTENSIONS:
if (gc->extensions) return gc->extensions; if (gc->extensions)
return gc->extensions;
break; break;
default: default:
__glXSetError(gc, GL_INVALID_ENUM); __glXSetError(gc, GL_INVALID_ENUM);
@ -637,12 +673,13 @@ const GLubyte *__indirect_glGetString(GLenum name)
(void) __glXFlushRenderBuffer(gc, gc->pc); (void) __glXFlushRenderBuffer(gc, gc->pc);
s = (GLubyte *) __glXGetStringFromServer(dpy, gc->majorOpcode, s = (GLubyte *) __glXGetStringFromServer(dpy, gc->majorOpcode,
X_GLsop_GetString, gc->currentContextTag, X_GLsop_GetString,
name ); gc->currentContextTag, name);
if (!s) { if (!s) {
/* Throw data on the floor */ /* Throw data on the floor */
__glXSetError(gc, GL_OUT_OF_MEMORY); __glXSetError(gc, GL_OUT_OF_MEMORY);
} else { }
else {
/* /*
** Update local cache ** Update local cache
*/ */
@ -733,8 +770,7 @@ const GLubyte *__indirect_glGetString(GLenum name)
* enable them. * enable them.
*/ */
(void *) glGetString(GL_VERSION); (void *) glGetString(GL_VERSION);
major = gc->server_major, major = gc->server_major, minor = gc->server_minor;
minor = gc->server_minor;
#endif #endif
__glXCalculateUsableGLExtensions(gc, (char *) s, major, minor); __glXCalculateUsableGLExtensions(gc, (char *) s, major, minor);
@ -747,7 +783,8 @@ const GLubyte *__indirect_glGetString(GLenum name)
return s; return s;
} }
GLboolean __indirect_glIsEnabled(GLenum cap) GLboolean
__indirect_glIsEnabled(GLenum cap)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private); __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
@ -755,7 +792,8 @@ GLboolean __indirect_glIsEnabled(GLenum cap)
GLboolean retval = 0; GLboolean retval = 0;
GLintptr enable; GLintptr enable;
if (!dpy) return 0; if (!dpy)
return 0;
switch (cap) { switch (cap) {
case GL_VERTEX_ARRAY: case GL_VERTEX_ARRAY:
@ -786,13 +824,15 @@ GLboolean __indirect_glIsEnabled(GLenum cap)
return retval; return retval;
} }
void __indirect_glGetPointerv(GLenum pname, void **params) void
__indirect_glGetPointerv(GLenum pname, void **params)
{ {
__GLXcontext *gc = __glXGetCurrentContext(); __GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private); __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
Display *dpy = gc->currentDpy; Display *dpy = gc->currentDpy;
if (!dpy) return; if (!dpy)
return;
switch (pname) { switch (pname) {
case GL_VERTEX_ARRAY_POINTER: case GL_VERTEX_ARRAY_POINTER:
@ -801,8 +841,7 @@ void __indirect_glGetPointerv(GLenum pname, void **params)
case GL_INDEX_ARRAY_POINTER: case GL_INDEX_ARRAY_POINTER:
case GL_EDGE_FLAG_ARRAY_POINTER: case GL_EDGE_FLAG_ARRAY_POINTER:
__glXGetArrayPointer(state, pname - GL_VERTEX_ARRAY_POINTER __glXGetArrayPointer(state, pname - GL_VERTEX_ARRAY_POINTER
+ GL_VERTEX_ARRAY, + GL_VERTEX_ARRAY, 0, params);
0, params );
return; return;
case GL_TEXTURE_COORD_ARRAY_POINTER: case GL_TEXTURE_COORD_ARRAY_POINTER:
__glXGetArrayPointer(state, GL_TEXTURE_COORD_ARRAY, __glXGetArrayPointer(state, GL_TEXTURE_COORD_ARRAY,
@ -811,8 +850,7 @@ void __indirect_glGetPointerv(GLenum pname, void **params)
case GL_SECONDARY_COLOR_ARRAY_POINTER: case GL_SECONDARY_COLOR_ARRAY_POINTER:
case GL_FOG_COORD_ARRAY_POINTER: case GL_FOG_COORD_ARRAY_POINTER:
__glXGetArrayPointer(state, pname - GL_FOG_COORD_ARRAY_POINTER __glXGetArrayPointer(state, pname - GL_FOG_COORD_ARRAY_POINTER
+ GL_FOG_COORD_ARRAY, + GL_FOG_COORD_ARRAY, 0, params);
0, params );
return; return;
case GL_FEEDBACK_BUFFER_POINTER: case GL_FEEDBACK_BUFFER_POINTER:
*params = (void *) gc->feedbackBuf; *params = (void *) gc->feedbackBuf;
@ -825,4 +863,3 @@ void __indirect_glGetPointerv(GLenum pname, void **params)
return; return;
} }
} }