diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-28 15:43:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-28 15:43:50 +0000 |
| commit | 87027d4d788c04d3f721b27eb718207bbf30f61c (patch) | |
| tree | e012c8b75aba8b7f2c5f6f2d509a57fbb07970ef /xorg-server | |
| parent | 3015123fd2904d907896b1aefbe32c267baa2dc2 (diff) | |
| download | vcxsrv-87027d4d788c04d3f721b27eb718207bbf30f61c.tar.gz vcxsrv-87027d4d788c04d3f721b27eb718207bbf30f61c.tar.bz2 vcxsrv-87027d4d788c04d3f721b27eb718207bbf30f61c.zip | |
Synchronised files
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/glx/glapi.h | 4 | ||||
| -rw-r--r-- | xorg-server/glx/glapitable.h | 2 | ||||
| -rw-r--r-- | xorg-server/glx/glapitemp.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index b64ad5d0c..a99317ad0 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -77,10 +77,10 @@ struct _glapi_table; #if defined (GLX_USE_TLS)
-_GLAPI_EXPORT extern TLS struct _glapi_table * _glapi_tls_Dispatch
+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch
__attribute__((tls_model("initial-exec")));
-_GLAPI_EXPORT extern TLS void * _glapi_tls_Context
+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context
__attribute__((tls_model("initial-exec")));
_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h index 9b419ba77..e5110ecfc 100644 --- a/xorg-server/glx/glapitable.h +++ b/xorg-server/glx/glapitable.h @@ -471,7 +471,7 @@ struct _glapi_table void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 428 */
void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 429 */
void (GLAPIENTRYP ClampColor)(GLenum target, GLenum clamp); /* 430 */
- void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, const GLfloat depth, const GLint stencil); /* 431 */
+ void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 431 */
void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 432 */
void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 433 */
void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 434 */
diff --git a/xorg-server/glx/glapitemp.h b/xorg-server/glx/glapitemp.h index 4101a63d3..5f6b91f2c 100644 --- a/xorg-server/glx/glapitemp.h +++ b/xorg-server/glx/glapitemp.h @@ -2637,7 +2637,7 @@ KEYWORD1 void KEYWORD2 NAME(ClampColor)(GLenum target, GLenum clamp) DISPATCH(ClampColor, (target, clamp), (F, "glClampColor(0x%x, 0x%x);\n", target, clamp));
}
-KEYWORD1 void KEYWORD2 NAME(ClearBufferfi)(GLenum buffer, GLint drawbuffer, const GLfloat depth, const GLint stencil)
+KEYWORD1 void KEYWORD2 NAME(ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
{
DISPATCH(ClearBufferfi, (buffer, drawbuffer, depth, stencil), (F, "glClearBufferfi(0x%x, %d, %f, %d);\n", buffer, drawbuffer, depth, stencil));
}
|