mesa: Rename gl_pack typedefs to mesa_pack.

These are packing mesa formats, not a GL format/type.

Reviewed-by: Thomas Helland <thomashelland90@gmail.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>

diff --git a/src/mesa/main/format_pack.h b/src/mesa/main/format_pack.h
index aa7113e9b27b406564f9f231432d5ae89c02d3d3..95dd0fc0142a1575d6ad0edd06aca4676dcc35bc 100644 (file)
--- a/src/mesa/main/format_pack.h
+++ b/src/mesa/main/format_pack.h
@@ -31,40 +31,40 @@
 
 
 /** Pack a GLubyte rgba[4] color to dest address */
-typedef void (*gl_pack_ubyte_rgba_func)(const GLubyte src[4], void *dst);
+typedef void (*mesa_pack_ubyte_rgba_func)(const GLubyte src[4], void *dst);
 
 /** Pack a GLfloat rgba[4] color to dest address */
-typedef void (*gl_pack_float_rgba_func)(const GLfloat src[4], void *dst);
+typedef void (*mesa_pack_float_rgba_func)(const GLfloat src[4], void *dst);
 
 /** Pack a GLfloat Z value to dest address */
-typedef void (*gl_pack_float_z_func)(const GLfloat *src, void *dst);
+typedef void (*mesa_pack_float_z_func)(const GLfloat *src, void *dst);
 
 /** Pack a GLuint Z value to dest address */
-typedef void (*gl_pack_uint_z_func)(const GLuint *src, void *dst);
+typedef void (*mesa_pack_uint_z_func)(const GLuint *src, void *dst);
 
 /** Pack a GLubyte stencil value to dest address */
-typedef void (*gl_pack_ubyte_stencil_func)(const GLubyte *src, void *dst);
+typedef void (*mesa_pack_ubyte_stencil_func)(const GLubyte *src, void *dst);
 
 
 
 
-extern gl_pack_ubyte_rgba_func
+extern mesa_pack_ubyte_rgba_func
 _mesa_get_pack_ubyte_rgba_function(mesa_format format);
 
 
-extern gl_pack_float_rgba_func
+extern mesa_pack_float_rgba_func
 _mesa_get_pack_float_rgba_function(mesa_format format);
 
 
-extern gl_pack_float_z_func
+extern mesa_pack_float_z_func
 _mesa_get_pack_float_z_func(mesa_format format);
 
 
-extern gl_pack_uint_z_func
+extern mesa_pack_uint_z_func
 _mesa_get_pack_uint_z_func(mesa_format format);
 
 
-extern gl_pack_ubyte_stencil_func
+extern mesa_pack_ubyte_stencil_func
 _mesa_get_pack_ubyte_stencil_func(mesa_format format);
 
 

diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py
index 9fa4f412d4c99f15124437d94d066527ec07ecac..19cec2032b8f0128bf9e1b6a50cfe4b4a8eac458 100644 (file)
--- a/src/mesa/main/format_pack.py
+++ b/src/mesa/main/format_pack.py
@@ -298,7 +298,7 @@ pack_float_r11g11b10_float(const GLfloat src[4], void *dst)
 /**
  * Return a function that can pack a GLubyte rgba[4] color.
  */
-gl_pack_ubyte_rgba_func
+mesa_pack_ubyte_rgba_func
 _mesa_get_pack_ubyte_rgba_function(mesa_format format)
 {
    switch (format) {
@@ -318,7 +318,7 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
 /**
  * Return a function that can pack a GLfloat rgba[4] color.
  */
-gl_pack_float_rgba_func
+mesa_pack_float_rgba_func
 _mesa_get_pack_float_rgba_function(mesa_format format)
 {
    switch (format) {
@@ -521,7 +521,7 @@ pack_float_Z_FLOAT32(const GLfloat *src, void *dst)
    *d = *src;
 }
 
-gl_pack_float_z_func
+mesa_pack_float_z_func
 _mesa_get_pack_float_z_func(mesa_format format)
 {
    switch (format) {
@@ -600,7 +600,7 @@ pack_uint_Z_FLOAT32(const GLuint *src, void *dst)
    assert(*d <= 1.0f);
 }
 
-gl_pack_uint_z_func
+mesa_pack_uint_z_func
 _mesa_get_pack_uint_z_func(mesa_format format)
 {
    switch (format) {
@@ -663,7 +663,7 @@ pack_ubyte_stencil_Z32_FLOAT_X24S8(const GLubyte *src, void *dst)
 }
 
 
-gl_pack_ubyte_stencil_func
+mesa_pack_ubyte_stencil_func
 _mesa_get_pack_ubyte_stencil_func(mesa_format format)
 {
    switch (format) {

diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index de7f14a4fc88ecb7f6510773228bdd647a444590..6bc737c79568e16e3852caac7b39f0d22c16f18d 100644 (file)
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -262,7 +262,7 @@ put_z32_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
       }
    }
    else {
-      gl_pack_uint_z_func packZ = _mesa_get_pack_uint_z_func(rb->Format);
+      mesa_pack_uint_z_func packZ = _mesa_get_pack_uint_z_func(rb->Format);
       const GLint bpp = _mesa_get_format_bytes(rb->Format);
       const GLint rowStride = srb->RowStride;
       for (i = 0; i < count; i++) {
@@ -379,7 +379,7 @@ _swrast_depth_test_span(struct gl_context *ctx, SWspan *span)
       }
       else {
          /* horizontal row */
-         gl_pack_uint_z_func packZ = _mesa_get_pack_uint_z_func(rb->Format);
+         mesa_pack_uint_z_func packZ = _mesa_get_pack_uint_z_func(rb->Format);
          GLubyte *dst = zStart;
          GLuint i;
          for (i = 0; i < count; i++) {

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 184a37c99b810c1459e8639e755e7cc981c155c9..16b5c61480c87bf00a212f829ebff66fad5f3308 100644 (file)
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1041,8 +1041,8 @@ put_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
            GLuint count, const GLint x[], const GLint y[],
            const void *values, const GLubyte *mask)
 {
-   gl_pack_ubyte_rgba_func pack_ubyte = NULL;
-   gl_pack_float_rgba_func pack_float = NULL;
+   mesa_pack_ubyte_rgba_func pack_ubyte = NULL;
+   mesa_pack_float_rgba_func pack_float = NULL;
    GLuint i;
 
    if (datatype == GL_UNSIGNED_BYTE)

diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index 8ccd5a16442cbcbcbcabbb7a826522c7266c1172..ce3d77c79a91b55a0d2e41a23b6ed3a08f6e6940 100644 (file)
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -329,7 +329,7 @@ put_s8_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
               const GLubyte stencil[])
 {
    const GLint w = rb->Width, h = rb->Height;
-   gl_pack_ubyte_stencil_func pack_stencil =
+   mesa_pack_ubyte_stencil_func pack_stencil =
       _mesa_get_pack_ubyte_stencil_func(rb->Format);
    GLuint i;