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

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

This commit is contained in:
RALOVICH, Kristóf 2008-10-13 14:18:18 +02:00 committed by Brian Paul
parent 6020e6e66a
commit 64d1c10e6c
1 changed files with 238 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

480
src/glx/x11/indirect_texture_compression.c
View File

@ -41,31 +41,31 @@
void void
__indirect_glGetCompressedTexImageARB( GLenum target, GLint level, __indirect_glGetCompressedTexImageARB(GLenum target, GLint level,
GLvoid * img ) GLvoid * img)
{ {
__GLX_SINGLE_DECLARE_VARIABLES(); __GLX_SINGLE_DECLARE_VARIABLES();
xGLXGetTexImageReply reply; xGLXGetTexImageReply reply;
size_t image_bytes; size_t image_bytes;
__GLX_SINGLE_LOAD_VARIABLES(); __GLX_SINGLE_LOAD_VARIABLES();
__GLX_SINGLE_BEGIN( X_GLsop_GetCompressedTexImage, 8 ); __GLX_SINGLE_BEGIN(X_GLsop_GetCompressedTexImage, 8);
__GLX_SINGLE_PUT_LONG( 0, target ); __GLX_SINGLE_PUT_LONG(0, target);
__GLX_SINGLE_PUT_LONG( 4, level ); __GLX_SINGLE_PUT_LONG(4, level);
__GLX_SINGLE_READ_XREPLY(); __GLX_SINGLE_READ_XREPLY();
image_bytes = reply.width; image_bytes = reply.width;
assert( image_bytes <= ((4 * reply.length) - 0) ); assert(image_bytes <= ((4 * reply.length) - 0));
assert( image_bytes >= ((4 * reply.length) - 3) ); assert(image_bytes >= ((4 * reply.length) - 3));
if ( image_bytes != 0 ) {
_XRead( dpy, (char *) img, image_bytes );
if ( image_bytes < (4 * reply.length) ) {
_XEatData( dpy, (4 * reply.length) - image_bytes );
}
}
__GLX_SINGLE_END(); if (image_bytes != 0) {
_XRead(dpy, (char *) img, image_bytes);
if (image_bytes < (4 * reply.length)) {
_XEatData(dpy, (4 * reply.length) - image_bytes);
}
}
__GLX_SINGLE_END();
} }
@ -74,60 +74,59 @@ __indirect_glGetCompressedTexImageARB( GLenum target, GLint level,
* \c glCompressedTexImage2D. * \c glCompressedTexImage2D.
*/ */
static void static void
CompressedTexImage1D2D( GLenum target, GLint level, CompressedTexImage1D2D(GLenum target, GLint level,
GLenum internal_format, GLenum internal_format,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
GLint border, GLsizei image_size, GLint border, GLsizei image_size,
const GLvoid *data, CARD32 rop ) const GLvoid * data, CARD32 rop)
{ {
__GLX_DECLARE_VARIABLES(); __GLX_DECLARE_VARIABLES();
__GLX_LOAD_VARIABLES(); __GLX_LOAD_VARIABLES();
if ( gc->currentDpy == NULL ) { if (gc->currentDpy == NULL) {
return; return;
} }
if ( (target == GL_PROXY_TEXTURE_1D) if ((target == GL_PROXY_TEXTURE_1D)
|| (target == GL_PROXY_TEXTURE_2D) || (target == GL_PROXY_TEXTURE_2D)
|| (target == GL_PROXY_TEXTURE_CUBE_MAP) ) { || (target == GL_PROXY_TEXTURE_CUBE_MAP)) {
compsize = 0; compsize = 0;
} }
else { else {
compsize = image_size; compsize = image_size;
} }
cmdlen = __GLX_PAD( __GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE cmdlen = __GLX_PAD(__GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE + compsize);
+ compsize ); if (cmdlen <= gc->maxSmallRenderCommandSize) {
if ( cmdlen <= gc->maxSmallRenderCommandSize ) { __GLX_BEGIN_VARIABLE(rop, cmdlen);
__GLX_BEGIN_VARIABLE( rop, cmdlen ); __GLX_PUT_LONG(4, target);
__GLX_PUT_LONG( 4, target ); __GLX_PUT_LONG(8, level);
__GLX_PUT_LONG( 8, level ); __GLX_PUT_LONG(12, internal_format);
__GLX_PUT_LONG( 12, internal_format ); __GLX_PUT_LONG(16, width);
__GLX_PUT_LONG( 16, width ); __GLX_PUT_LONG(20, height);
__GLX_PUT_LONG( 20, height ); __GLX_PUT_LONG(24, border);
__GLX_PUT_LONG( 24, border ); __GLX_PUT_LONG(28, image_size);
__GLX_PUT_LONG( 28, image_size ); if (compsize != 0) {
if ( compsize != 0 ) { __GLX_PUT_CHAR_ARRAY(__GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE,
__GLX_PUT_CHAR_ARRAY( __GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE, data, image_size);
data, image_size ); }
} __GLX_END(cmdlen);
__GLX_END( cmdlen ); }
} else {
else { assert(compsize != 0);
assert( compsize != 0 );
__GLX_BEGIN_VARIABLE_LARGE( rop, cmdlen + 4 ); __GLX_BEGIN_VARIABLE_LARGE(rop, cmdlen + 4);
__GLX_PUT_LONG( 8, target ); __GLX_PUT_LONG(8, target);
__GLX_PUT_LONG( 12, level ); __GLX_PUT_LONG(12, level);
__GLX_PUT_LONG( 16, internal_format ); __GLX_PUT_LONG(16, internal_format);
__GLX_PUT_LONG( 20, width ); __GLX_PUT_LONG(20, width);
__GLX_PUT_LONG( 24, height ); __GLX_PUT_LONG(24, height);
__GLX_PUT_LONG( 28, border ); __GLX_PUT_LONG(28, border);
__GLX_PUT_LONG( 32, image_size ); __GLX_PUT_LONG(32, image_size);
__glXSendLargeCommand( gc, gc->pc, __glXSendLargeCommand(gc, gc->pc,
__GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE + 4, __GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE + 4,
data, image_size ); data, image_size);
} }
} }
@ -136,213 +135,210 @@ CompressedTexImage1D2D( GLenum target, GLint level,
* \c glCompressedTexSubImage2D. * \c glCompressedTexSubImage2D.
*/ */
static void static void
CompressedTexSubImage1D2D( GLenum target, GLint level, CompressedTexSubImage1D2D(GLenum target, GLint level,
GLsizei xoffset, GLsizei yoffset, GLsizei xoffset, GLsizei yoffset,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
GLenum format, GLsizei image_size, GLenum format, GLsizei image_size,
const GLvoid *data, CARD32 rop ) const GLvoid * data, CARD32 rop)
{ {
__GLX_DECLARE_VARIABLES(); __GLX_DECLARE_VARIABLES();
__GLX_LOAD_VARIABLES(); __GLX_LOAD_VARIABLES();
if ( gc->currentDpy == NULL ) { if (gc->currentDpy == NULL) {
return; return;
} }
if ( target == GL_PROXY_TEXTURE_3D ) { if (target == GL_PROXY_TEXTURE_3D) {
compsize = 0; compsize = 0;
} }
else { else {
compsize = image_size; compsize = image_size;
} }
cmdlen = __GLX_PAD( __GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE cmdlen = __GLX_PAD(__GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE + compsize);
+ compsize ); if (cmdlen <= gc->maxSmallRenderCommandSize) {
if ( cmdlen <= gc->maxSmallRenderCommandSize ) { __GLX_BEGIN_VARIABLE(rop, cmdlen);
__GLX_BEGIN_VARIABLE( rop, cmdlen ); __GLX_PUT_LONG(4, target);
__GLX_PUT_LONG( 4, target ); __GLX_PUT_LONG(8, level);
__GLX_PUT_LONG( 8, level ); __GLX_PUT_LONG(12, xoffset);
__GLX_PUT_LONG( 12, xoffset ); __GLX_PUT_LONG(16, yoffset);
__GLX_PUT_LONG( 16, yoffset ); __GLX_PUT_LONG(20, width);
__GLX_PUT_LONG( 20, width ); __GLX_PUT_LONG(24, height);
__GLX_PUT_LONG( 24, height ); __GLX_PUT_LONG(28, format);
__GLX_PUT_LONG( 28, format ); __GLX_PUT_LONG(32, image_size);
__GLX_PUT_LONG( 32, image_size ); if (compsize != 0) {
if ( compsize != 0 ) { __GLX_PUT_CHAR_ARRAY(__GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE,
__GLX_PUT_CHAR_ARRAY( __GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE, data, image_size);
data, image_size ); }
} __GLX_END(cmdlen);
__GLX_END( cmdlen ); }
} else {
else { assert(compsize != 0);
assert( compsize != 0 );
__GLX_BEGIN_VARIABLE_LARGE( rop, cmdlen + 4 ); __GLX_BEGIN_VARIABLE_LARGE(rop, cmdlen + 4);
__GLX_PUT_LONG( 8, target ); __GLX_PUT_LONG(8, target);
__GLX_PUT_LONG( 12, level ); __GLX_PUT_LONG(12, level);
__GLX_PUT_LONG( 16, xoffset ); __GLX_PUT_LONG(16, xoffset);
__GLX_PUT_LONG( 20, yoffset ); __GLX_PUT_LONG(20, yoffset);
__GLX_PUT_LONG( 24, width ); __GLX_PUT_LONG(24, width);
__GLX_PUT_LONG( 28, height ); __GLX_PUT_LONG(28, height);
__GLX_PUT_LONG( 32, format ); __GLX_PUT_LONG(32, format);
__GLX_PUT_LONG( 36, image_size ); __GLX_PUT_LONG(36, image_size);
__glXSendLargeCommand( gc, gc->pc, __glXSendLargeCommand(gc, gc->pc,
__GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE + 4, __GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE + 4,
data, image_size ); data, image_size);
} }
} }
void void
__indirect_glCompressedTexImage1DARB( GLenum target, GLint level, __indirect_glCompressedTexImage1DARB(GLenum target, GLint level,
GLenum internal_format, GLsizei width, GLenum internal_format, GLsizei width,
GLint border, GLsizei image_size, GLint border, GLsizei image_size,
const GLvoid *data ) const GLvoid * data)
{ {
CompressedTexImage1D2D( target, level, internal_format, width, 0, CompressedTexImage1D2D(target, level, internal_format, width, 0,
border, image_size, data, border, image_size, data,
X_GLrop_CompressedTexImage1D ); X_GLrop_CompressedTexImage1D);
} }
void void
__indirect_glCompressedTexImage2DARB( GLenum target, GLint level, __indirect_glCompressedTexImage2DARB(GLenum target, GLint level,
GLenum internal_format, GLenum internal_format,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
GLint border, GLsizei image_size, GLint border, GLsizei image_size,
const GLvoid *data ) const GLvoid * data)
{ {
CompressedTexImage1D2D( target, level, internal_format, width, height, CompressedTexImage1D2D(target, level, internal_format, width, height,
border, image_size, data, border, image_size, data,
X_GLrop_CompressedTexImage2D ); X_GLrop_CompressedTexImage2D);
} }
void void
__indirect_glCompressedTexImage3DARB( GLenum target, GLint level, __indirect_glCompressedTexImage3DARB(GLenum target, GLint level,
GLenum internal_format, GLenum internal_format,
GLsizei width, GLsizei height, GLsizei depth, GLsizei width, GLsizei height,
GLint border, GLsizei image_size, GLsizei depth, GLint border,
const GLvoid *data ) GLsizei image_size, const GLvoid * data)
{ {
__GLX_DECLARE_VARIABLES(); __GLX_DECLARE_VARIABLES();
__GLX_LOAD_VARIABLES();
if ( gc->currentDpy == NULL ) {
return;
}
cmdlen = __GLX_PAD( __GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE __GLX_LOAD_VARIABLES();
+ image_size ); if (gc->currentDpy == NULL) {
if ( cmdlen <= gc->maxSmallRenderCommandSize ) { return;
__GLX_BEGIN_VARIABLE( X_GLrop_CompressedTexImage3D, cmdlen ); }
__GLX_PUT_LONG( 4, target );
__GLX_PUT_LONG( 8, level ); cmdlen = __GLX_PAD(__GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE + image_size);
__GLX_PUT_LONG( 12, internal_format ); if (cmdlen <= gc->maxSmallRenderCommandSize) {
__GLX_PUT_LONG( 16, width ); __GLX_BEGIN_VARIABLE(X_GLrop_CompressedTexImage3D, cmdlen);
__GLX_PUT_LONG( 20, height ); __GLX_PUT_LONG(4, target);
__GLX_PUT_LONG( 24, depth ); __GLX_PUT_LONG(8, level);
__GLX_PUT_LONG( 28, border ); __GLX_PUT_LONG(12, internal_format);
__GLX_PUT_LONG( 32, image_size ); __GLX_PUT_LONG(16, width);
if ( image_size != 0 ) { __GLX_PUT_LONG(20, height);
__GLX_PUT_CHAR_ARRAY( __GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE, __GLX_PUT_LONG(24, depth);
data, image_size ); __GLX_PUT_LONG(28, border);
} __GLX_PUT_LONG(32, image_size);
__GLX_END( cmdlen ); if (image_size != 0) {
} __GLX_PUT_CHAR_ARRAY(__GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE,
else { data, image_size);
__GLX_BEGIN_VARIABLE_LARGE( X_GLrop_CompressedTexImage3D, }
cmdlen + 4 ); __GLX_END(cmdlen);
__GLX_PUT_LONG( 8, target ); }
__GLX_PUT_LONG( 12, level ); else {
__GLX_PUT_LONG( 16, internal_format ); __GLX_BEGIN_VARIABLE_LARGE(X_GLrop_CompressedTexImage3D, cmdlen + 4);
__GLX_PUT_LONG( 20, width ); __GLX_PUT_LONG(8, target);
__GLX_PUT_LONG( 24, height ); __GLX_PUT_LONG(12, level);
__GLX_PUT_LONG( 28, depth ); __GLX_PUT_LONG(16, internal_format);
__GLX_PUT_LONG( 32, border ); __GLX_PUT_LONG(20, width);
__GLX_PUT_LONG( 36, image_size ); __GLX_PUT_LONG(24, height);
__glXSendLargeCommand( gc, gc->pc, __GLX_PUT_LONG(28, depth);
__GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE + 4, __GLX_PUT_LONG(32, border);
data, image_size ); __GLX_PUT_LONG(36, image_size);
} __glXSendLargeCommand(gc, gc->pc,
__GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE + 4,
data, image_size);
}
} }
void void
__indirect_glCompressedTexSubImage1DARB( GLenum target, GLint level, __indirect_glCompressedTexSubImage1DARB(GLenum target, GLint level,
GLint xoffset, GLint xoffset,
GLsizei width, GLsizei width,
GLenum format, GLsizei image_size, GLenum format, GLsizei image_size,
const GLvoid *data ) const GLvoid * data)
{ {
CompressedTexSubImage1D2D( target, level, xoffset, 0, width, 0, CompressedTexSubImage1D2D(target, level, xoffset, 0, width, 0,
format, image_size, data, format, image_size, data,
X_GLrop_CompressedTexSubImage1D ); X_GLrop_CompressedTexSubImage1D);
} }
void void
__indirect_glCompressedTexSubImage2DARB( GLenum target, GLint level, __indirect_glCompressedTexSubImage2DARB(GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
GLenum format, GLsizei image_size, GLenum format, GLsizei image_size,
const GLvoid *data ) const GLvoid * data)
{ {
CompressedTexSubImage1D2D( target, level, xoffset, yoffset, width, height, CompressedTexSubImage1D2D(target, level, xoffset, yoffset, width, height,
format, image_size, data, format, image_size, data,
X_GLrop_CompressedTexSubImage2D ); X_GLrop_CompressedTexSubImage2D);
} }
void void
__indirect_glCompressedTexSubImage3DARB( GLenum target, GLint level, __indirect_glCompressedTexSubImage3DARB(GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset, GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height, GLsizei depth, GLint zoffset, GLsizei width,
GLenum format, GLsizei image_size, GLsizei height, GLsizei depth,
const GLvoid *data ) GLenum format, GLsizei image_size,
const GLvoid * data)
{ {
__GLX_DECLARE_VARIABLES(); __GLX_DECLARE_VARIABLES();
__GLX_LOAD_VARIABLES();
if ( gc->currentDpy == NULL ) {
return;
}
cmdlen = __GLX_PAD( __GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE __GLX_LOAD_VARIABLES();
+ image_size ); if (gc->currentDpy == NULL) {
if ( cmdlen <= gc->maxSmallRenderCommandSize ) { return;
__GLX_BEGIN_VARIABLE( X_GLrop_CompressedTexSubImage3D, cmdlen ); }
__GLX_PUT_LONG( 4, target );
__GLX_PUT_LONG( 8, level ); cmdlen = __GLX_PAD(__GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE
__GLX_PUT_LONG( 12, xoffset ); + image_size);
__GLX_PUT_LONG( 16, yoffset ); if (cmdlen <= gc->maxSmallRenderCommandSize) {
__GLX_PUT_LONG( 20, zoffset ); __GLX_BEGIN_VARIABLE(X_GLrop_CompressedTexSubImage3D, cmdlen);
__GLX_PUT_LONG( 24, width ); __GLX_PUT_LONG(4, target);
__GLX_PUT_LONG( 28, height ); __GLX_PUT_LONG(8, level);
__GLX_PUT_LONG( 32, depth ); __GLX_PUT_LONG(12, xoffset);
__GLX_PUT_LONG( 36, format ); __GLX_PUT_LONG(16, yoffset);
__GLX_PUT_LONG( 40, image_size ); __GLX_PUT_LONG(20, zoffset);
if ( image_size != 0 ) { __GLX_PUT_LONG(24, width);
__GLX_PUT_CHAR_ARRAY( __GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE, __GLX_PUT_LONG(28, height);
data, image_size ); __GLX_PUT_LONG(32, depth);
} __GLX_PUT_LONG(36, format);
__GLX_END( cmdlen ); __GLX_PUT_LONG(40, image_size);
} if (image_size != 0) {
else { __GLX_PUT_CHAR_ARRAY(__GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE,
__GLX_BEGIN_VARIABLE_LARGE( X_GLrop_CompressedTexSubImage3D, data, image_size);
cmdlen + 4 ); }
__GLX_PUT_LONG( 8, target ); __GLX_END(cmdlen);
__GLX_PUT_LONG( 12, level ); }
__GLX_PUT_LONG( 16, xoffset ); else {
__GLX_PUT_LONG( 20, yoffset ); __GLX_BEGIN_VARIABLE_LARGE(X_GLrop_CompressedTexSubImage3D, cmdlen + 4);
__GLX_PUT_LONG( 24, zoffset ); __GLX_PUT_LONG(8, target);
__GLX_PUT_LONG( 28, width ); __GLX_PUT_LONG(12, level);
__GLX_PUT_LONG( 32, height ); __GLX_PUT_LONG(16, xoffset);
__GLX_PUT_LONG( 36, depth ); __GLX_PUT_LONG(20, yoffset);
__GLX_PUT_LONG( 40, format ); __GLX_PUT_LONG(24, zoffset);
__GLX_PUT_LONG( 44, image_size ); __GLX_PUT_LONG(28, width);
__glXSendLargeCommand( gc, gc->pc, __GLX_PUT_LONG(32, height);
__GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE + 4, __GLX_PUT_LONG(36, depth);
data, image_size ); __GLX_PUT_LONG(40, format);
} __GLX_PUT_LONG(44, image_size);
__glXSendLargeCommand(gc, gc->pc,
__GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE + 4,
data, image_size);
}
} }