Re: [Mesa-dev] [PATCH] mesa: Add warning to _REV pack/unpack functions with incorrect behavior

2014-01-30 Thread Marek Olšák 
Pushed, thanks.

Marek

On Sun, Jan 26, 2014 at 7:43 PM, Mark Mueller markkmuel...@gmail.com wrote:
 Signed-off-by: Mark Mueller markkmuel...@gmail.com
 ---
  src/mesa/main/format_pack.c   |  7 ++-
  src/mesa/main/format_unpack.c | 12 
  2 files changed, 18 insertions(+), 1 deletion(-)

 diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
 index 39d767a..4c7ed58 100644
 --- a/src/mesa/main/format_pack.c
 +++ b/src/mesa/main/format_pack.c
 @@ -492,6 +492,8 @@ pack_row_float_RGB565(GLuint n, const GLfloat src[][4], 
 void *dst)

  /*
   * MESA_FORMAT_R5G6B5_UNORM
 + * Warning: these functions do not match the current Mesa definition
 + * of MESA_FORMAT_R5G6B5_UNORM.
   */

  static void
 @@ -621,7 +623,10 @@ pack_float_ARGB1555(const GLfloat src[4], void *dst)
  }


 -/* MESA_FORMAT_A1R5G5B5_UNORM */
 +/* MESA_FORMAT_A1R5G5B5_UNORM
 + * Warning: these functions do not match the current Mesa definition
 + * of MESA_FORMAT_A1R5G5B5_UNORM.
 + */

  static void
  pack_ubyte_ARGB1555_REV(const GLubyte src[4], void *dst)
 diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
 index 52aa7d2..dc9eba7 100644
 --- a/src/mesa/main/format_unpack.c
 +++ b/src/mesa/main/format_unpack.c
 @@ -234,6 +234,9 @@ unpack_RGB565(const void *src, GLfloat dst[][4], GLuint n)
  static void
  unpack_RGB565_REV(const void *src, GLfloat dst[][4], GLuint n)
  {
 +   /* Warning: this function does not match the current Mesa definition
 +* of MESA_FORMAT_R5G6B5_UNORM.
 +*/
 const GLushort *s = ((const GLushort *) src);
 GLuint i;
 for (i = 0; i  n; i++) {
 @@ -300,6 +303,9 @@ unpack_ARGB1555(const void *src, GLfloat dst[][4], GLuint 
 n)
  static void
  unpack_ARGB1555_REV(const void *src, GLfloat dst[][4], GLuint n)
  {
 +   /* Warning: this function does not match the current Mesa definition
 +* of MESA_FORMAT_A1R5G5B5_UNORM.
 +*/
 const GLushort *s = ((const GLushort *) src);
 GLuint i;
 for (i = 0; i  n; i++) {
 @@ -2699,6 +2705,9 @@ unpack_ubyte_RGB565(const void *src, GLubyte dst[][4], 
 GLuint n)
  static void
  unpack_ubyte_RGB565_REV(const void *src, GLubyte dst[][4], GLuint n)
  {
 +   /* Warning: this function does not match the current Mesa definition
 +* of MESA_FORMAT_R5G6B5_UNORM.
 +*/
 const GLushort *s = ((const GLushort *) src);
 GLuint i;
 for (i = 0; i  n; i++) {
 @@ -2765,6 +2774,9 @@ unpack_ubyte_ARGB1555(const void *src, GLubyte 
 dst[][4], GLuint n)
  static void
  unpack_ubyte_ARGB1555_REV(const void *src, GLubyte dst[][4], GLuint n)
  {
 +   /* Warning: this function does not match the current Mesa definition
 +* of MESA_FORMAT_A1R5G5B5_UNORM.
 +*/
 const GLushort *s = ((const GLushort *) src);
 GLuint i;
 for (i = 0; i  n; i++) {
 --
 1.8.3.1

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] mesa: Add warning to _REV pack/unpack functions with incorrect behavior

2014-01-26 Thread Mark Mueller 
Signed-off-by: Mark Mueller markkmuel...@gmail.com
---
 src/mesa/main/format_pack.c   |  7 ++-
 src/mesa/main/format_unpack.c | 12 
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index 39d767a..4c7ed58 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -492,6 +492,8 @@ pack_row_float_RGB565(GLuint n, const GLfloat src[][4], 
void *dst)
 
 /*
  * MESA_FORMAT_R5G6B5_UNORM
+ * Warning: these functions do not match the current Mesa definition
+ * of MESA_FORMAT_R5G6B5_UNORM.
  */
 
 static void
@@ -621,7 +623,10 @@ pack_float_ARGB1555(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_A1R5G5B5_UNORM */
+/* MESA_FORMAT_A1R5G5B5_UNORM
+ * Warning: these functions do not match the current Mesa definition
+ * of MESA_FORMAT_A1R5G5B5_UNORM.
+ */
 
 static void
 pack_ubyte_ARGB1555_REV(const GLubyte src[4], void *dst)
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index 52aa7d2..dc9eba7 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -234,6 +234,9 @@ unpack_RGB565(const void *src, GLfloat dst[][4], GLuint n)
 static void
 unpack_RGB565_REV(const void *src, GLfloat dst[][4], GLuint n)
 {
+   /* Warning: this function does not match the current Mesa definition
+* of MESA_FORMAT_R5G6B5_UNORM.
+*/
const GLushort *s = ((const GLushort *) src);
GLuint i;
for (i = 0; i  n; i++) {
@@ -300,6 +303,9 @@ unpack_ARGB1555(const void *src, GLfloat dst[][4], GLuint n)
 static void
 unpack_ARGB1555_REV(const void *src, GLfloat dst[][4], GLuint n)
 {
+   /* Warning: this function does not match the current Mesa definition
+* of MESA_FORMAT_A1R5G5B5_UNORM.
+*/
const GLushort *s = ((const GLushort *) src);
GLuint i;
for (i = 0; i  n; i++) {
@@ -2699,6 +2705,9 @@ unpack_ubyte_RGB565(const void *src, GLubyte dst[][4], 
GLuint n)
 static void
 unpack_ubyte_RGB565_REV(const void *src, GLubyte dst[][4], GLuint n)
 {
+   /* Warning: this function does not match the current Mesa definition
+* of MESA_FORMAT_R5G6B5_UNORM.
+*/
const GLushort *s = ((const GLushort *) src);
GLuint i;
for (i = 0; i  n; i++) {
@@ -2765,6 +2774,9 @@ unpack_ubyte_ARGB1555(const void *src, GLubyte dst[][4], 
GLuint n)
 static void
 unpack_ubyte_ARGB1555_REV(const void *src, GLubyte dst[][4], GLuint n)
 {
+   /* Warning: this function does not match the current Mesa definition
+* of MESA_FORMAT_A1R5G5B5_UNORM.
+*/
const GLushort *s = ((const GLushort *) src);
GLuint i;
for (i = 0; i  n; i++) {
-- 
1.8.3.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev