diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
| commit | 0130346adbce7e6b2422429887fc46c76806d845 (patch) | |
| tree | 1b88028d42d79ab8062581d361a720b04a87fbc0 /mesalib/src/mapi/glapi/gen | |
| parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
| download | vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.gz vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.bz2 vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.zip | |
randrproto mesa pixman git update 4 oct 2012
randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455
mesa: 185d6df3c10a7ff5defe163af614bfc41088910b
pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/es_EXT.xml | 6 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_SPARC_asm.py | 2 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py | 6 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_x86_asm.py | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index c38e65a24..9e735834d 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -731,4 +731,10 @@ <enum name="RG8_EXT" value="0x822B"/> </category> +<!-- 111. GL_ANGLE_texture_compression_dxt --> +<category name="ANGLE_texture_compression_dxt" number="111"> + <enum name="COMPRESSED_RGBA_S3TC_DXT3_ANGLE" value="0x83F2"/> + <enum name="COMPRESSED_RGBA_S3TC_DXT5_ANGLE" value="0x83F3"/> +</category> + </OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/gl_SPARC_asm.py b/mesalib/src/mapi/glapi/gen/gl_SPARC_asm.py index 400e684da..553959687 100644 --- a/mesalib/src/mapi/glapi/gen/gl_SPARC_asm.py +++ b/mesalib/src/mapi/glapi/gen/gl_SPARC_asm.py @@ -120,7 +120,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\t sethi\tGL_OFF(off), %g3;\t\t\t\\' print '\t.size\tfn,.-fn;' print '' - print '#elif defined(PTHREADS)' + print '#elif defined(HAVE_PTHREAD)' print '' print '\t/* 64-bit 0x00 --> sethi %hh(_glapi_Dispatch), %g1 */' print '\t/* 64-bit 0x04 --> sethi %lm(_glapi_Dispatch), %g2 */' diff --git a/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py b/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py index 3ef5e08a9..9a085eaec 100644 --- a/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py +++ b/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py @@ -138,7 +138,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '# define GL_PREFIX(n) GLNAME(CONCAT(gl,n))' print '# endif' print '' - print '#if defined(PTHREADS) || defined(_WIN32)' + print '#if defined(HAVE_PTHREAD) || defined(_WIN32)' print '# define THREADS' print '#endif' print '' @@ -158,7 +158,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\tret' print '\t.size\t_x86_64_get_dispatch, .-_x86_64_get_dispatch' print '' - print '#elif defined(PTHREADS)' + print '#elif defined(HAVE_PTHREAD)' print '' print '\t.extern\t_glapi_Dispatch' print '\t.extern\t_gl_DispatchTSD' @@ -251,7 +251,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\tcall\t_x86_64_get_dispatch@PLT' print '\tmovq\t%u(%%rax), %%r11' % (f.offset * 8) print '\tjmp\t*%r11' - print '#elif defined(PTHREADS)' + print '#elif defined(HAVE_PTHREAD)' save_all_regs(registers) print '\tcall\t_x86_64_get_dispatch@PLT' diff --git a/mesalib/src/mapi/glapi/gen/gl_x86_asm.py b/mesalib/src/mapi/glapi/gen/gl_x86_asm.py index 095edcdc0..5eaa340f7 100644 --- a/mesalib/src/mapi/glapi/gen/gl_x86_asm.py +++ b/mesalib/src/mapi/glapi/gen/gl_x86_asm.py @@ -78,7 +78,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '#define GLOBL_FN(x) GLOBL x' print '#endif' print '' - print '#if defined(PTHREADS) || defined(_WIN32)' + print '#if defined(HAVE_PTHREAD) || defined(_WIN32)' print '# define THREADS' print '#endif' print '' @@ -98,7 +98,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\tCTX_INSNS ; \\' print '\tJMP(GL_OFFSET(off))' print '' - print '#elif defined(PTHREADS)' + print '#elif defined(HAVE_PTHREAD)' print '# define GL_STUB(fn,off,fn_alt)\t\t\t\\' print 'ALIGNTEXT16;\t\t\t\t\t\t\\' print 'GLOBL_FN(GL_PREFIX(fn, fn_alt));\t\t\t\\' @@ -152,7 +152,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\tmovl _glapi_tls_Dispatch@GOTNTPOFF(%eax), %eax' print '\tret' print '' - print '#elif defined(PTHREADS)' + print '#elif defined(HAVE_PTHREAD)' print 'EXTERN GLNAME(_glapi_Dispatch)' print 'EXTERN GLNAME(_gl_DispatchTSD)' print 'EXTERN GLNAME(pthread_getspecific)' |