diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 08:08:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 08:08:32 +0200 |
| commit | a5391fdea94a7b827069c6f926f83a235076ccb4 (patch) | |
| tree | a0cb44794381a26177f2fbcc6a2c55696ab42287 /mesalib/src/mesa | |
| parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
| download | vcxsrv-a5391fdea94a7b827069c6f926f83a235076ccb4.tar.gz vcxsrv-a5391fdea94a7b827069c6f926f83a235076ccb4.tar.bz2 vcxsrv-a5391fdea94a7b827069c6f926f83a235076ccb4.zip | |
libX11 mesa xkeyboard-config mesa git update 1 Oct 2013
xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
libxcb commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9
libxcb/xcb-proto commit bd7708ac1037e647b094fa7440ebb6171b9bc75f
xkeyboard-config commit aae40f98d6694e852c5e192f05643adbd16a3253
libX11 commit 18a5278b008e9faa59b346fcab18a8d74b875fda
libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf
libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4
libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a
libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff
libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae
pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5
xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a
randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72
glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e
mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0
xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft commit c5e760a239afc62a1c75e0509868e35957c8df52
libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4
libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0
fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
mesa commit eb0a57acaa7026b3212742a30f4ada3271d95616
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/main/extensions.c | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/get_hash_params.py | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/glheader.h | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 |
4 files changed, 1 insertions, 13 deletions
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index eb9362059..51a8051e2 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -263,7 +263,6 @@ static const struct extension extension_table[] = { { "GL_OES_framebuffer_object", o(dummy_true), ES1, 2005 }, { "GL_OES_get_program_binary", o(dummy_true), ES2, 2008 }, { "GL_OES_mapbuffer", o(dummy_true), ES1 | ES2, 2005 }, - { "GL_OES_matrix_get", o(dummy_true), ES1, 2004 }, { "GL_OES_packed_depth_stencil", o(EXT_packed_depth_stencil), ES1 | ES2, 2007 }, { "GL_OES_point_size_array", o(dummy_true), ES1, 2004 }, { "GL_OES_point_sprite", o(ARB_point_sprite), ES1, 2004 }, diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py index fb321a3df..8147dd0b8 100644 --- a/mesalib/src/mesa/main/get_hash_params.py +++ b/mesalib/src/mesa/main/get_hash_params.py @@ -229,11 +229,6 @@ descriptor=[ { "apis": ["GLES"], "params": [ -# XXX: OES_matrix_get - [ "MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES", "" ], - [ "PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES", "" ], - [ "TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES", "" ], - # OES_point_size_array [ "POINT_SIZE_ARRAY_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled, TYPE_BOOLEAN)" ], [ "POINT_SIZE_ARRAY_TYPE_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM)" ], diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h index b3b0c52a0..4ed51b317 100644 --- a/mesalib/src/mesa/main/glheader.h +++ b/mesalib/src/mesa/main/glheader.h @@ -115,12 +115,6 @@ typedef void *GLeglImageOES; #define GL_PALETTE8_RGB5_A1_OES 0x8B99 #endif -#ifndef GL_OES_matrix_get -#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D -#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E -#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES 0x898F -#endif - #ifndef GL_ES_VERSION_2_0 #define GL_SHADER_BINARY_FORMATS 0x8DF8 #define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c index 67c6f53f6..1bbeced34 100644 --- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -853,7 +853,7 @@ emit_wpos_adjustment( struct st_translate *t, /** - * Emit fragment position/ooordinate code. + * Emit fragment position/coordinate code. */ static void emit_wpos(struct st_context *st, |