OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: use the newer PIPE_FORMAT_x_UNORM format names

Browse Source
This commit is contained in:
Brian Paul
2008-04-30 16:50:17 -06:00
parent 8d45576ec5
commit 54f94a790e
10 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/draw/draw_pipe_aaline.c
View File

@@ -392,7 +392,7 @@ aaline_create_texture(struct aaline_stage *aaline)
memset(&texTemp, 0, sizeof(texTemp)); memset(&texTemp, 0, sizeof(texTemp));
texTemp.target = PIPE_TEXTURE_2D; texTemp.target = PIPE_TEXTURE_2D;
texTemp.format = PIPE_FORMAT_U_A8; /* XXX verify supported by driver! */ texTemp.format = PIPE_FORMAT_A8_UNORM; /* XXX verify supported by driver! */
texTemp.last_level = MAX_TEXTURE_LEVEL; texTemp.last_level = MAX_TEXTURE_LEVEL;
texTemp.width[0] = 1 << MAX_TEXTURE_LEVEL; texTemp.width[0] = 1 << MAX_TEXTURE_LEVEL;
texTemp.height[0] = 1 << MAX_TEXTURE_LEVEL; texTemp.height[0] = 1 << MAX_TEXTURE_LEVEL;

2
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
View File

@@ -417,7 +417,7 @@ pstip_create_texture(struct pstip_stage *pstip)
memset(&texTemp, 0, sizeof(texTemp)); memset(&texTemp, 0, sizeof(texTemp));
texTemp.target = PIPE_TEXTURE_2D; texTemp.target = PIPE_TEXTURE_2D;
texTemp.format = PIPE_FORMAT_U_A8; /* XXX verify supported by driver! */ texTemp.format = PIPE_FORMAT_A8_UNORM; /* XXX verify supported by driver! */
texTemp.last_level = 0; texTemp.last_level = 0;
texTemp.width[0] = 32; texTemp.width[0] = 32;
texTemp.height[0] = 32; texTemp.height[0] = 32;

24
src/gallium/auxiliary/util/p_tile.c
View File

@@ -385,7 +385,7 @@ z16_get_tile_rgba(ushort *src,
/*** PIPE_FORMAT_U_L8 ***/ /*** PIPE_FORMAT_L8_UNORM ***/
static void static void
l8_get_tile_rgba(ubyte *src, l8_get_tile_rgba(ubyte *src,
@@ -408,7 +408,7 @@ l8_get_tile_rgba(ubyte *src,
} }
/*** PIPE_FORMAT_U_A8 ***/ /*** PIPE_FORMAT_A8_UNORM ***/
static void static void
a8_get_tile_rgba(ubyte *src, a8_get_tile_rgba(ubyte *src,
@@ -476,7 +476,7 @@ r16g16b16a16_put_tile_rgba(short *dst,
/*** PIPE_FORMAT_U_I8 ***/ /*** PIPE_FORMAT_I8_UNORM ***/
static void static void
i8_get_tile_rgba(ubyte *src, i8_get_tile_rgba(ubyte *src,
@@ -499,7 +499,7 @@ i8_get_tile_rgba(ubyte *src,
} }
/*** PIPE_FORMAT_U_A8_L8 ***/ /*** PIPE_FORMAT_A8L8_UNORM ***/
static void static void
a8_l8_get_tile_rgba(ushort *src, a8_l8_get_tile_rgba(ushort *src,
@@ -708,16 +708,16 @@ pipe_get_tile_rgba(struct pipe_context *pipe,
case PIPE_FORMAT_R5G6B5_UNORM: case PIPE_FORMAT_R5G6B5_UNORM:
r5g6b5_get_tile_rgba((ushort *) packed, w, h, p, dst_stride); r5g6b5_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
break; break;
case PIPE_FORMAT_U_L8: case PIPE_FORMAT_L8_UNORM:
l8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride); l8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride);
break; break;
case PIPE_FORMAT_U_A8: case PIPE_FORMAT_A8_UNORM:
a8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride); a8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride);
break; break;
case PIPE_FORMAT_U_I8: case PIPE_FORMAT_I8_UNORM:
i8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride); i8_get_tile_rgba((ubyte *) packed, w, h, p, dst_stride);
break; break;
case PIPE_FORMAT_U_A8_L8: case PIPE_FORMAT_A8L8_UNORM:
a8_l8_get_tile_rgba((ushort *) packed, w, h, p, dst_stride); a8_l8_get_tile_rgba((ushort *) packed, w, h, p, dst_stride);
break; break;
case PIPE_FORMAT_R16G16B16A16_SNORM: case PIPE_FORMAT_R16G16B16A16_SNORM:
@@ -787,16 +787,16 @@ pipe_put_tile_rgba(struct pipe_context *pipe,
break; break;
case PIPE_FORMAT_R8G8B8A8_UNORM: case PIPE_FORMAT_R8G8B8A8_UNORM:
break; break;
case PIPE_FORMAT_U_L8: case PIPE_FORMAT_L8_UNORM:
/*l8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/ /*l8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/
break; break;
case PIPE_FORMAT_U_A8: case PIPE_FORMAT_A8_UNORM:
/*a8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/ /*a8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/
break; break;
case PIPE_FORMAT_U_I8: case PIPE_FORMAT_I8_UNORM:
/*i8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/ /*i8_put_tile_rgba((ubyte *) packed, w, h, p, src_stride);*/
break; break;
case PIPE_FORMAT_U_A8_L8: case PIPE_FORMAT_A8L8_UNORM:
/*a8_l8_put_tile_rgba((ushort *) packed, w, h, p, src_stride);*/ /*a8_l8_put_tile_rgba((ushort *) packed, w, h, p, src_stride);*/
break; break;
case PIPE_FORMAT_R16G16B16A16_SNORM: case PIPE_FORMAT_R16G16B16A16_SNORM:

8
src/gallium/auxiliary/util/u_gen_mipmap.c
View File

@@ -493,13 +493,13 @@ format_to_type_comps(enum pipe_format pformat,
*datatype = USHORT_5_6_5; *datatype = USHORT_5_6_5;
*comps = 3; *comps = 3;
return; return;
case PIPE_FORMAT_U_L8: case PIPE_FORMAT_L8_UNORM:
case PIPE_FORMAT_U_A8: case PIPE_FORMAT_A8_UNORM:
case PIPE_FORMAT_U_I8: case PIPE_FORMAT_I8_UNORM:
*datatype = UBYTE; *datatype = UBYTE;
*comps = 1; *comps = 1;
return; return;
case PIPE_FORMAT_U_A8_L8: case PIPE_FORMAT_A8L8_UNORM:
*datatype = UBYTE; *datatype = UBYTE;
*comps = 2; *comps = 2;
return; return;

8
src/gallium/drivers/i915simple/i915_screen.c
View File

@@ -154,10 +154,10 @@ i915_is_format_supported( struct pipe_screen *screen,
PIPE_FORMAT_R8G8B8A8_UNORM, PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_FORMAT_A8R8G8B8_UNORM, PIPE_FORMAT_A8R8G8B8_UNORM,
PIPE_FORMAT_R5G6B5_UNORM, PIPE_FORMAT_R5G6B5_UNORM,
PIPE_FORMAT_U_L8, PIPE_FORMAT_L8_UNORM,
PIPE_FORMAT_U_A8, PIPE_FORMAT_A8_UNORM,
PIPE_FORMAT_U_I8, PIPE_FORMAT_I8_UNORM,
PIPE_FORMAT_U_A8_L8, PIPE_FORMAT_A8L8_UNORM,
PIPE_FORMAT_YCBCR, PIPE_FORMAT_YCBCR,
PIPE_FORMAT_YCBCR_REV, PIPE_FORMAT_YCBCR_REV,
PIPE_FORMAT_S8Z24_UNORM, PIPE_FORMAT_S8Z24_UNORM,

8
src/gallium/drivers/i915simple/i915_state_sampler.c
View File

@@ -131,13 +131,13 @@ static uint
translate_texture_format(enum pipe_format pipeFormat) translate_texture_format(enum pipe_format pipeFormat)
{ {
switch (pipeFormat) { switch (pipeFormat) {
case PIPE_FORMAT_U_L8: case PIPE_FORMAT_L8_UNORM:
return MAPSURF_8BIT | MT_8BIT_L8; return MAPSURF_8BIT | MT_8BIT_L8;
case PIPE_FORMAT_U_I8: case PIPE_FORMAT_I8_UNORM:
return MAPSURF_8BIT | MT_8BIT_I8; return MAPSURF_8BIT | MT_8BIT_I8;
case PIPE_FORMAT_U_A8: case PIPE_FORMAT_A8_UNORM:
return MAPSURF_8BIT | MT_8BIT_A8; return MAPSURF_8BIT | MT_8BIT_A8;
case PIPE_FORMAT_U_A8_L8: case PIPE_FORMAT_A8L8_UNORM:
return MAPSURF_16BIT | MT_16BIT_AY88; return MAPSURF_16BIT | MT_16BIT_AY88;
case PIPE_FORMAT_R5G6B5_UNORM: case PIPE_FORMAT_R5G6B5_UNORM:
return MAPSURF_16BIT | MT_16BIT_RGB565; return MAPSURF_16BIT | MT_16BIT_RGB565;

24
src/gallium/drivers/i965simple/brw_screen.c
View File

@@ -141,13 +141,13 @@ brw_is_format_supported( struct pipe_screen *screen,
#if 0 #if 0
/* XXX: This is broken -- rewrite if still needed. */ /* XXX: This is broken -- rewrite if still needed. */
static const unsigned tex_supported[] = { static const unsigned tex_supported[] = {
PIPE_FORMAT_U_R8_G8_B8_A8, PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_FORMAT_U_A8_R8_G8_B8, PIPE_FORMAT_A8R8G8B8_UNORM,
PIPE_FORMAT_U_R5_G6_B5, PIPE_FORMAT_R5G6B5_UNORM,
PIPE_FORMAT_U_L8, PIPE_FORMAT_L8_UNORM,
PIPE_FORMAT_U_A8, PIPE_FORMAT_A8_UNORM,
PIPE_FORMAT_U_I8, PIPE_FORMAT_I8_UNORM,
PIPE_FORMAT_U_L8_A8, PIPE_FORMAT_L8A8_UNORM,
PIPE_FORMAT_YCBCR, PIPE_FORMAT_YCBCR,
PIPE_FORMAT_YCBCR_REV, PIPE_FORMAT_YCBCR_REV,
PIPE_FORMAT_S8_Z24, PIPE_FORMAT_S8_Z24,
@@ -157,16 +157,16 @@ brw_is_format_supported( struct pipe_screen *screen,
/* Actually a lot more than this - add later: /* Actually a lot more than this - add later:
*/ */
static const unsigned render_supported[] = { static const unsigned render_supported[] = {
PIPE_FORMAT_U_A8_R8_G8_B8, PIPE_FORMAT_A8R8G8B8_UNORM,
PIPE_FORMAT_U_R5_G6_B5, PIPE_FORMAT_R5G6B5_UNORM,
}; };
/* /*
*/ */
static const unsigned z_stencil_supported[] = { static const unsigned z_stencil_supported[] = {
PIPE_FORMAT_U_Z16, PIPE_FORMAT_Z16_UNORM,
PIPE_FORMAT_U_Z32, PIPE_FORMAT_Z32_UNORM,
PIPE_FORMAT_S8_Z24, PIPE_FORMAT_S8Z24_UNORM,
}; };
switch (type) { switch (type) {

8
src/gallium/drivers/i965simple/brw_wm_surface_state.c
View File

@@ -57,16 +57,16 @@ static unsigned translate_tex_target( enum pipe_texture_target target )
static unsigned translate_tex_format( enum pipe_format pipe_format ) static unsigned translate_tex_format( enum pipe_format pipe_format )
{ {
switch( pipe_format ) { switch( pipe_format ) {
case PIPE_FORMAT_U_L8: case PIPE_FORMAT_L8_UNORM:
return BRW_SURFACEFORMAT_L8_UNORM; return BRW_SURFACEFORMAT_L8_UNORM;
case PIPE_FORMAT_U_I8: case PIPE_FORMAT_I8_UNORM:
return BRW_SURFACEFORMAT_I8_UNORM; return BRW_SURFACEFORMAT_I8_UNORM;
case PIPE_FORMAT_U_A8: case PIPE_FORMAT_A8_UNORM:
return BRW_SURFACEFORMAT_A8_UNORM; return BRW_SURFACEFORMAT_A8_UNORM;
case PIPE_FORMAT_U_A8_L8: case PIPE_FORMAT_A8L8_UNORM:
return BRW_SURFACEFORMAT_L8A8_UNORM; return BRW_SURFACEFORMAT_L8A8_UNORM;
case PIPE_FORMAT_R8G8B8_UNORM: case PIPE_FORMAT_R8G8B8_UNORM:

4
src/mesa/state_tracker/st_cb_bitmap.c
View File

@@ -722,8 +722,8 @@ st_init_bitmap(struct st_context *st)
st->bitmap.rasterizer.bypass_vs = 1; st->bitmap.rasterizer.bypass_vs = 1;
/* find a usable texture format */ /* find a usable texture format */
if (screen->is_format_supported(screen, PIPE_FORMAT_U_I8, PIPE_TEXTURE)) { if (screen->is_format_supported(screen, PIPE_FORMAT_I8_UNORM, PIPE_TEXTURE)) {
st->bitmap.tex_format = PIPE_FORMAT_U_I8; st->bitmap.tex_format = PIPE_FORMAT_I8_UNORM;
} }
else { else {
/* XXX support more formats */ /* XXX support more formats */

32
src/mesa/state_tracker/st_format.c
View File

@@ -261,13 +261,13 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat)
case MESA_FORMAT_RGB565: case MESA_FORMAT_RGB565:
return PIPE_FORMAT_R5G6B5_UNORM; return PIPE_FORMAT_R5G6B5_UNORM;
case MESA_FORMAT_AL88: case MESA_FORMAT_AL88:
return PIPE_FORMAT_U_A8_L8; return PIPE_FORMAT_A8L8_UNORM;
case MESA_FORMAT_A8: case MESA_FORMAT_A8:
return PIPE_FORMAT_U_A8; return PIPE_FORMAT_A8_UNORM;
case MESA_FORMAT_L8: case MESA_FORMAT_L8:
return PIPE_FORMAT_U_L8; return PIPE_FORMAT_L8_UNORM;
case MESA_FORMAT_I8: case MESA_FORMAT_I8:
return PIPE_FORMAT_U_I8; return PIPE_FORMAT_I8_UNORM;
case MESA_FORMAT_Z16: case MESA_FORMAT_Z16:
return PIPE_FORMAT_Z16_UNORM; return PIPE_FORMAT_Z16_UNORM;
case MESA_FORMAT_Z32: case MESA_FORMAT_Z32:
@@ -409,8 +409,8 @@ st_choose_format(struct pipe_context *pipe, GLint internalFormat,
case GL_ALPHA12: case GL_ALPHA12:
case GL_ALPHA16: case GL_ALPHA16:
case GL_COMPRESSED_ALPHA: case GL_COMPRESSED_ALPHA:
if (screen->is_format_supported( screen, PIPE_FORMAT_U_A8, surfType )) if (screen->is_format_supported( screen, PIPE_FORMAT_A8_UNORM, surfType ))
return PIPE_FORMAT_U_A8; return PIPE_FORMAT_A8_UNORM;
return default_rgba_format( screen, surfType ); return default_rgba_format( screen, surfType );
case 1: case 1:
@@ -420,8 +420,8 @@ st_choose_format(struct pipe_context *pipe, GLint internalFormat,
case GL_LUMINANCE12: case GL_LUMINANCE12:
case GL_LUMINANCE16: case GL_LUMINANCE16:
case GL_COMPRESSED_LUMINANCE: case GL_COMPRESSED_LUMINANCE:
if (screen->is_format_supported( screen, PIPE_FORMAT_U_L8, surfType )) if (screen->is_format_supported( screen, PIPE_FORMAT_L8_UNORM, surfType ))
return PIPE_FORMAT_U_L8; return PIPE_FORMAT_L8_UNORM;
return default_rgba_format( screen, surfType ); return default_rgba_format( screen, surfType );
case 2: case 2:
@@ -433,8 +433,8 @@ st_choose_format(struct pipe_context *pipe, GLint internalFormat,
case GL_LUMINANCE12_ALPHA12: case GL_LUMINANCE12_ALPHA12:
case GL_LUMINANCE16_ALPHA16: case GL_LUMINANCE16_ALPHA16:
case GL_COMPRESSED_LUMINANCE_ALPHA: case GL_COMPRESSED_LUMINANCE_ALPHA:
if (screen->is_format_supported( screen, PIPE_FORMAT_U_A8_L8, surfType )) if (screen->is_format_supported( screen, PIPE_FORMAT_A8L8_UNORM, surfType ))
return PIPE_FORMAT_U_A8_L8; return PIPE_FORMAT_A8L8_UNORM;
return default_rgba_format( screen, surfType ); return default_rgba_format( screen, surfType );
case GL_INTENSITY: case GL_INTENSITY:
@@ -443,8 +443,8 @@ st_choose_format(struct pipe_context *pipe, GLint internalFormat,
case GL_INTENSITY12: case GL_INTENSITY12:
case GL_INTENSITY16: case GL_INTENSITY16:
case GL_COMPRESSED_INTENSITY: case GL_COMPRESSED_INTENSITY:
if (screen->is_format_supported( screen, PIPE_FORMAT_U_I8, surfType )) if (screen->is_format_supported( screen, PIPE_FORMAT_I8_UNORM, surfType ))
return PIPE_FORMAT_U_I8; return PIPE_FORMAT_I8_UNORM;
return default_rgba_format( screen, surfType ); return default_rgba_format( screen, surfType );
case GL_YCBCR_MESA: case GL_YCBCR_MESA:
@@ -547,13 +547,13 @@ translate_gallium_format_to_mesa_format(enum pipe_format format)
return &_mesa_texformat_argb4444; return &_mesa_texformat_argb4444;
case PIPE_FORMAT_R5G6B5_UNORM: case PIPE_FORMAT_R5G6B5_UNORM:
return &_mesa_texformat_rgb565; return &_mesa_texformat_rgb565;
case PIPE_FORMAT_U_A8_L8: case PIPE_FORMAT_A8L8_UNORM:
return &_mesa_texformat_al88; return &_mesa_texformat_al88;
case PIPE_FORMAT_U_A8: case PIPE_FORMAT_A8_UNORM:
return &_mesa_texformat_a8; return &_mesa_texformat_a8;
case PIPE_FORMAT_U_L8: case PIPE_FORMAT_L8_UNORM:
return &_mesa_texformat_l8; return &_mesa_texformat_l8;
case PIPE_FORMAT_U_I8: case PIPE_FORMAT_I8_UNORM:
return &_mesa_texformat_i8; return &_mesa_texformat_i8;
case PIPE_FORMAT_Z16_UNORM: case PIPE_FORMAT_Z16_UNORM:
return &_mesa_texformat_z16; return &_mesa_texformat_z16;