KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

softpipe: Rename pipe formats.

This commit is contained in:
José Fonseca 2010-03-01 18:13:57 +00:00
parent b5cfa6f196
commit b7b07b0029
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gallium/drivers/softpipe/sp_quad_depth_test.c
View File

@ -73,8 +73,8 @@ get_depth_stencil_values( struct depth_data *data,
data->bzzzz[j] = tile->data.depth32[y][x]; data->bzzzz[j] = tile->data.depth32[y][x];
} }
break; break;
case PIPE_FORMAT_X8Z24_UNORM: case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_S8Z24_UNORM: case PIPE_FORMAT_Z24S8_UNORM:
for (j = 0; j < QUAD_SIZE; j++) { for (j = 0; j < QUAD_SIZE; j++) {
int x = quad->input.x0 % TILE_SIZE + (j & 1); int x = quad->input.x0 % TILE_SIZE + (j & 1);
int y = quad->input.y0 % TILE_SIZE + (j >> 1); int y = quad->input.y0 % TILE_SIZE + (j >> 1);
@ -82,8 +82,8 @@ get_depth_stencil_values( struct depth_data *data,
data->stencilVals[j] = tile->data.depth32[y][x] >> 24; data->stencilVals[j] = tile->data.depth32[y][x] >> 24;
} }
break; break;
case PIPE_FORMAT_Z24X8_UNORM: case PIPE_FORMAT_X8Z24_UNORM:
case PIPE_FORMAT_Z24S8_UNORM: case PIPE_FORMAT_S8Z24_UNORM:
for (j = 0; j < QUAD_SIZE; j++) { for (j = 0; j < QUAD_SIZE; j++) {
int x = quad->input.x0 % TILE_SIZE + (j & 1); int x = quad->input.x0 % TILE_SIZE + (j & 1);
int y = quad->input.y0 % TILE_SIZE + (j >> 1); int y = quad->input.y0 % TILE_SIZE + (j >> 1);
@ -146,8 +146,8 @@ convert_quad_depth( struct depth_data *data,
} }
} }
break; break;
case PIPE_FORMAT_X8Z24_UNORM: case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_S8Z24_UNORM: case PIPE_FORMAT_Z24S8_UNORM:
{ {
float scale = (float) ((1 << 24) - 1); float scale = (float) ((1 << 24) - 1);
@ -156,8 +156,8 @@ convert_quad_depth( struct depth_data *data,
} }
} }
break; break;
case PIPE_FORMAT_Z24X8_UNORM: case PIPE_FORMAT_X8Z24_UNORM:
case PIPE_FORMAT_Z24S8_UNORM: case PIPE_FORMAT_S8Z24_UNORM:
{ {
float scale = (float) ((1 << 24) - 1); float scale = (float) ((1 << 24) - 1);
@ -189,7 +189,7 @@ write_depth_stencil_values( struct depth_data *data,
tile->data.depth16[y][x] = (ushort) data->bzzzz[j]; tile->data.depth16[y][x] = (ushort) data->bzzzz[j];
} }
break; break;
case PIPE_FORMAT_X8Z24_UNORM: case PIPE_FORMAT_Z24X8_UNORM:
case PIPE_FORMAT_Z32_UNORM: case PIPE_FORMAT_Z32_UNORM:
for (j = 0; j < QUAD_SIZE; j++) { for (j = 0; j < QUAD_SIZE; j++) {
int x = quad->input.x0 % TILE_SIZE + (j & 1); int x = quad->input.x0 % TILE_SIZE + (j & 1);
@ -197,21 +197,21 @@ write_depth_stencil_values( struct depth_data *data,
tile->data.depth32[y][x] = data->bzzzz[j]; tile->data.depth32[y][x] = data->bzzzz[j];
} }
break; break;
case PIPE_FORMAT_S8Z24_UNORM: case PIPE_FORMAT_Z24S8_UNORM:
for (j = 0; j < QUAD_SIZE; j++) { for (j = 0; j < QUAD_SIZE; j++) {
int x = quad->input.x0 % TILE_SIZE + (j & 1); int x = quad->input.x0 % TILE_SIZE + (j & 1);
int y = quad->input.y0 % TILE_SIZE + (j >> 1); int y = quad->input.y0 % TILE_SIZE + (j >> 1);
tile->data.depth32[y][x] = (data->stencilVals[j] << 24) | data->bzzzz[j]; tile->data.depth32[y][x] = (data->stencilVals[j] << 24) | data->bzzzz[j];
} }
break; break;
case PIPE_FORMAT_Z24S8_UNORM: case PIPE_FORMAT_S8Z24_UNORM:
for (j = 0; j < QUAD_SIZE; j++) { for (j = 0; j < QUAD_SIZE; j++) {
int x = quad->input.x0 % TILE_SIZE + (j & 1); int x = quad->input.x0 % TILE_SIZE + (j & 1);
int y = quad->input.y0 % TILE_SIZE + (j >> 1); int y = quad->input.y0 % TILE_SIZE + (j >> 1);
tile->data.depth32[y][x] = (data->bzzzz[j] << 8) | data->stencilVals[j]; tile->data.depth32[y][x] = (data->bzzzz[j] << 8) | data->stencilVals[j];
} }
break; break;
case PIPE_FORMAT_Z24X8_UNORM: case PIPE_FORMAT_X8Z24_UNORM:
for (j = 0; j < QUAD_SIZE; j++) { for (j = 0; j < QUAD_SIZE; j++) {
int x = quad->input.x0 % TILE_SIZE + (j & 1); int x = quad->input.x0 % TILE_SIZE + (j & 1);
int y = quad->input.y0 % TILE_SIZE + (j >> 1); int y = quad->input.y0 % TILE_SIZE + (j >> 1);

8
src/gallium/drivers/softpipe/sp_screen.c
View File

@ -152,16 +152,16 @@ softpipe_is_format_supported( struct pipe_screen *screen,
switch(format) { switch(format) {
case PIPE_FORMAT_L16_UNORM: case PIPE_FORMAT_L16_UNORM:
case PIPE_FORMAT_YCBCR_REV: case PIPE_FORMAT_YUYV:
case PIPE_FORMAT_YCBCR: case PIPE_FORMAT_UYVY:
case PIPE_FORMAT_DXT1_RGB: case PIPE_FORMAT_DXT1_RGB:
case PIPE_FORMAT_DXT1_RGBA: case PIPE_FORMAT_DXT1_RGBA:
case PIPE_FORMAT_DXT3_RGBA: case PIPE_FORMAT_DXT3_RGBA:
case PIPE_FORMAT_DXT5_RGBA: case PIPE_FORMAT_DXT5_RGBA:
case PIPE_FORMAT_Z32_FLOAT: case PIPE_FORMAT_Z32_FLOAT:
case PIPE_FORMAT_R8G8_SNORM: case PIPE_FORMAT_R8G8_SNORM:
case PIPE_FORMAT_B6UG5SR5S_NORM: case PIPE_FORMAT_R5SG5SB6U_NORM:
case PIPE_FORMAT_X8UB8UG8SR8S_NORM: case PIPE_FORMAT_R8SG8SB8UX8U_NORM:
case PIPE_FORMAT_R8G8B8A8_SNORM: case PIPE_FORMAT_R8G8B8A8_SNORM:
case PIPE_FORMAT_NONE: case PIPE_FORMAT_NONE:
return FALSE; return FALSE;

2
src/gallium/drivers/softpipe/sp_texture.c
View File

@ -426,7 +426,7 @@ softpipe_video_surface_create(struct pipe_screen *screen,
memset(&template, 0, sizeof(struct pipe_texture)); memset(&template, 0, sizeof(struct pipe_texture));
template.target = PIPE_TEXTURE_2D; template.target = PIPE_TEXTURE_2D;
template.format = PIPE_FORMAT_X8R8G8B8_UNORM; template.format = PIPE_FORMAT_B8G8R8X8_UNORM;
template.last_level = 0; template.last_level = 0;
/* vl_mpeg12_mc_renderer expects this when it's initialized with pot_buffers=true */ /* vl_mpeg12_mc_renderer expects this when it's initialized with pot_buffers=true */
template.width0 = util_next_power_of_two(width); template.width0 = util_next_power_of_two(width);

6
src/gallium/drivers/softpipe/sp_tile_cache.c
View File

@ -162,10 +162,10 @@ sp_tile_cache_set_surface(struct softpipe_tile_cache *tc,
PIPE_TRANSFER_READ_WRITE, PIPE_TRANSFER_READ_WRITE,
0, 0, ps->width, ps->height); 0, 0, ps->width, ps->height);
tc->depth_stencil = (ps->format == PIPE_FORMAT_S8Z24_UNORM || tc->depth_stencil = (ps->format == PIPE_FORMAT_Z24S8_UNORM ||
ps->format == PIPE_FORMAT_X8Z24_UNORM ||
ps->format == PIPE_FORMAT_Z24S8_UNORM ||
ps->format == PIPE_FORMAT_Z24X8_UNORM || ps->format == PIPE_FORMAT_Z24X8_UNORM ||
ps->format == PIPE_FORMAT_S8Z24_UNORM ||
ps->format == PIPE_FORMAT_X8Z24_UNORM ||
ps->format == PIPE_FORMAT_Z16_UNORM || ps->format == PIPE_FORMAT_Z16_UNORM ||
ps->format == PIPE_FORMAT_Z32_UNORM || ps->format == PIPE_FORMAT_Z32_UNORM ||
ps->format == PIPE_FORMAT_S8_UNORM); ps->format == PIPE_FORMAT_S8_UNORM);