fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Rename gl_pack typedefs to mesa_pack.

Browse source 
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>
This commit is contained in:
Eric Anholt 2019-07-01 14:29:45 -07:00
parent 20ce56ad5b
commit 93a7651d8d
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/main/format_pack.h
View file

@ -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);

10
src/mesa/main/format_pack.py
View file

@ -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) {

4
src/mesa/swrast/s_depth.c
View file

@ -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++) {

4
src/mesa/swrast/s_span.c
View file

@ -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)

2
src/mesa/swrast/s_stencil.c
View file

@ -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;