fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 02:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "Simplify the redundant meaning of format layout."

Browse source 
This reverts commit eb926ddf9e.
This commit is contained in:
Michal Krol 2009-12-09 14:22:30 +01:00
parent eb926ddf9e
commit dfdf83d714
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/auxiliary/util/u_format.h
View file

@ -34,8 +34,11 @@
enum util_format_layout {
UTIL_FORMAT_LAYOUT_PLAIN = 0, /*< RGB, depth-stencil */
UTIL_FORMAT_LAYOUT_DXT = 1
UTIL_FORMAT_LAYOUT_SCALAR = 0,
UTIL_FORMAT_LAYOUT_ARITH = 1,
UTIL_FORMAT_LAYOUT_ARRAY = 2,
UTIL_FORMAT_LAYOUT_YUV = 3,
UTIL_FORMAT_LAYOUT_DXT = 4
};

10
src/gallium/auxiliary/util/u_format_table.py
View file

@ -35,12 +35,8 @@ import sys
from u_format_parse import *
layout_map = {
'arith': 'UTIL_FORMAT_LAYOUT_PLAIN',
'array': 'UTIL_FORMAT_LAYOUT_PLAIN',
'yuv': 'UTIL_FORMAT_LAYOUT_PLAIN',
'dxt': 'UTIL_FORMAT_LAYOUT_DXT',
}
def layout_map(layout):
return 'UTIL_FORMAT_LAYOUT_' + str(layout).upper()
def colorspace_map(colorspace):
@ -108,7 +104,7 @@ def write_format_table(formats):
print " %s," % (format.name,)
print " \"%s\"," % (format.name,)
print " {%u, %u, %u}, /* block */" % (format.block_width, format.block_height, format.block_size())
print " %s," % (layout_map[format.layout],)
print " %s," % (layout_map(format.layout),)
print " {"
for i in range(4):
type = format.in_types[i]

8
src/gallium/drivers/llvmpipe/lp_screen.c
View file

@ -158,7 +158,9 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
format_desc->block.height != 1)
return FALSE;
if(format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN)
if(format_desc->layout != UTIL_FORMAT_LAYOUT_SCALAR &&
format_desc->layout != UTIL_FORMAT_LAYOUT_ARITH &&
format_desc->layout != UTIL_FORMAT_LAYOUT_ARRAY)
return FALSE;
if(format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB &&
@ -186,7 +188,9 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
format_desc->block.height != 1)
return FALSE;
if(format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN)
if(format_desc->layout != UTIL_FORMAT_LAYOUT_SCALAR &&
format_desc->layout != UTIL_FORMAT_LAYOUT_ARITH &&
format_desc->layout != UTIL_FORMAT_LAYOUT_ARRAY)
return FALSE;
if(format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB &&

6
src/gallium/drivers/r300/r300_state_inlines.h
View file

@ -476,7 +476,8 @@ r300_translate_vertex_data_type(enum pipe_format format) {
desc = util_format_description(format);
if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) {
if (desc->layout != UTIL_FORMAT_LAYOUT_ARITH &&
desc->layout != UTIL_FORMAT_LAYOUT_ARRAY) {
debug_printf("r300: Bad format %s in %s:%d\n", pf_name(format),
__FUNCTION__, __LINE__);
assert(0);
@ -540,7 +541,8 @@ r300_translate_vertex_data_swizzle(enum pipe_format format) {
assert(format);
if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) {
if (desc->layout != UTIL_FORMAT_LAYOUT_ARITH &&
desc->layout != UTIL_FORMAT_LAYOUT_ARRAY) {
debug_printf("r300: Bad format %s in %s:%d\n",
pf_name(format), __FUNCTION__, __LINE__);
return 0;

5
src/mesa/state_tracker/st_format.c
View file

@ -83,7 +83,8 @@ st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo)
desc = util_format_description(format);
assert(desc);
if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN) {
if (desc->layout == UTIL_FORMAT_LAYOUT_ARITH ||
desc->layout == UTIL_FORMAT_LAYOUT_ARRAY) {
#if 0
printf("%s\n", pf_name( format ) );
#endif
@ -146,7 +147,7 @@ st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo)
pinfo->mesa_format = st_pipe_format_to_mesa_format(format);
}
else if (desc->colorspace == UTIL_FORMAT_COLORSPACE_YUV) {
else if (desc->layout == UTIL_FORMAT_LAYOUT_YUV) {
pinfo->mesa_format = MESA_FORMAT_YCBCR;
pinfo->datatype = GL_UNSIGNED_SHORT;
pinfo->size = 2; /* two bytes per "texel" */