aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-01 08:10:02 +0200
committermarha <marha@users.sourceforge.net>2013-10-01 08:10:02 +0200
commit11b60c4ebaf348b01051bfff19f947b073028a99 (patch)
tree4f4a25423fa7a6cf28e2575eeec77e5f8a4a34bb /mesalib/src
parent4366c8fe34719e14906c420d7596e818aadf6ce0 (diff)
parenta5391fdea94a7b827069c6f926f83a235076ccb4 (diff)
downloadvcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.tar.gz
vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.tar.bz2
vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 mesa xkeyboard-config mesa git update 1 Oct 2013
Diffstat (limited to 'mesalib/src')
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_format.c2
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_format.h7
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_rect.h6
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_tile.c2
-rw-r--r--mesalib/src/mesa/main/extensions.c1
-rw-r--r--mesalib/src/mesa/main/get_hash_params.py5
-rw-r--r--mesalib/src/mesa/main/glheader.h6
-rw-r--r--mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c2
8 files changed, 9 insertions, 22 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c
index 08ef6ab3e..a8aa5719d 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.c
+++ b/mesalib/src/gallium/auxiliary/util/u_format.c
@@ -34,9 +34,9 @@
#include "u_math.h"
#include "u_memory.h"
-#include "u_rect.h"
#include "u_format.h"
#include "u_format_s3tc.h"
+#include "u_surface.h"
#include "pipe/p_defines.h"
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index 28527f532..84f16d503 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -716,10 +716,15 @@ static INLINE uint
util_format_get_blocksize(enum pipe_format format)
{
uint bits = util_format_get_blocksizebits(format);
+ uint bytes = bits / 8;
assert(bits % 8 == 0);
+ assert(bytes > 0);
+ if (bytes == 0) {
+ bytes = 1;
+ }
- return bits / 8;
+ return bytes;
}
static INLINE uint
diff --git a/mesalib/src/gallium/auxiliary/util/u_rect.h b/mesalib/src/gallium/auxiliary/util/u_rect.h
index 10909b202..c141550be 100644
--- a/mesalib/src/gallium/auxiliary/util/u_rect.h
+++ b/mesalib/src/gallium/auxiliary/util/u_rect.h
@@ -83,10 +83,4 @@ u_rect_possible_intersection(const struct u_rect *a,
}
#endif
-
-/* Include pipe copy/fill rect helpers declarations for backwards compatibility
- */
-#include "util/u_surface.h"
-
-
#endif /* U_RECT_H */
diff --git a/mesalib/src/gallium/auxiliary/util/u_tile.c b/mesalib/src/gallium/auxiliary/util/u_tile.c
index 62298cdab..fb80aec42 100644
--- a/mesalib/src/gallium/auxiliary/util/u_tile.c
+++ b/mesalib/src/gallium/auxiliary/util/u_tile.c
@@ -37,7 +37,7 @@
#include "util/u_format.h"
#include "util/u_math.h"
#include "util/u_memory.h"
-#include "util/u_rect.h"
+#include "util/u_surface.h"
#include "util/u_tile.h"
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,