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

mesa: fix a few format table mistakes, assertions

Browse Source 
The BaseFormat field was incorrect for a few R and RG formats.
Fix a couple assertions too.

NOTE: This is a candidate for the 7.9 and 7.10 branches.
This commit is contained in:
Brian Paul
2011-01-11 09:23:45 -07:00
parent 33d0c44910
commit 0073f50cd4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/main/formats.c
View File

@@ -802,7 +802,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
MESA_FORMAT_SIGNED_R8, /* Name */ MESA_FORMAT_SIGNED_R8, /* Name */
"MESA_FORMAT_SIGNED_R8", /* StrName */ "MESA_FORMAT_SIGNED_R8", /* StrName */
GL_RGBA, /* BaseFormat */ GL_RED, /* BaseFormat */
GL_SIGNED_NORMALIZED, /* DataType */ GL_SIGNED_NORMALIZED, /* DataType */
8, 0, 0, 0, /* Red/Green/Blue/AlphaBits */ 8, 0, 0, 0, /* Red/Green/Blue/AlphaBits */
0, 0, 0, 0, 0, /* Lum/Int/Index/Depth/StencilBits */ 0, 0, 0, 0, 0, /* Lum/Int/Index/Depth/StencilBits */
@@ -811,7 +811,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
MESA_FORMAT_SIGNED_RG88, MESA_FORMAT_SIGNED_RG88,
"MESA_FORMAT_SIGNED_RG88", "MESA_FORMAT_SIGNED_RG88",
GL_RGBA, GL_RG,
GL_SIGNED_NORMALIZED, GL_SIGNED_NORMALIZED,
8, 8, 0, 0, 8, 8, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -820,7 +820,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
MESA_FORMAT_SIGNED_RGBX8888, MESA_FORMAT_SIGNED_RGBX8888,
"MESA_FORMAT_SIGNED_RGBX8888", "MESA_FORMAT_SIGNED_RGBX8888",
GL_RGBA, GL_RGB,
GL_SIGNED_NORMALIZED, GL_SIGNED_NORMALIZED,
8, 8, 8, 0, 8, 8, 8, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -849,7 +849,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
MESA_FORMAT_SIGNED_R_16, MESA_FORMAT_SIGNED_R_16,
"MESA_FORMAT_SIGNED_R_16", "MESA_FORMAT_SIGNED_R_16",
GL_RGBA, GL_RED,
GL_SIGNED_NORMALIZED, GL_SIGNED_NORMALIZED,
16, 0, 0, 0, 16, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -858,7 +858,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
MESA_FORMAT_SIGNED_RG_16, MESA_FORMAT_SIGNED_RG_16,
"MESA_FORMAT_SIGNED_RG_16", "MESA_FORMAT_SIGNED_RG_16",
GL_RGBA, GL_RG,
GL_SIGNED_NORMALIZED, GL_SIGNED_NORMALIZED,
16, 16, 0, 0, 16, 16, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -867,7 +867,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
{ {
MESA_FORMAT_SIGNED_RGB_16, MESA_FORMAT_SIGNED_RGB_16,
"MESA_FORMAT_SIGNED_RGB_16", "MESA_FORMAT_SIGNED_RGB_16",
GL_RGBA, GL_RGB,
GL_SIGNED_NORMALIZED, GL_SIGNED_NORMALIZED,
16, 16, 16, 0, 16, 16, 16, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1192,7 +1192,7 @@ _mesa_test_formats(void)
if (info->RedBits > 0) { if (info->RedBits > 0) {
GLuint t = info->RedBits + info->GreenBits GLuint t = info->RedBits + info->GreenBits
+ info->BlueBits + info->AlphaBits; + info->BlueBits + info->AlphaBits;
assert(t / 8 == info->BytesPerBlock); assert(t / 8 <= info->BytesPerBlock);
(void) t; (void) t;
} }
} }
@@ -1200,6 +1200,7 @@ _mesa_test_formats(void)
assert(info->DataType == GL_UNSIGNED_NORMALIZED || assert(info->DataType == GL_UNSIGNED_NORMALIZED ||
info->DataType == GL_SIGNED_NORMALIZED || info->DataType == GL_SIGNED_NORMALIZED ||
info->DataType == GL_UNSIGNED_INT || info->DataType == GL_UNSIGNED_INT ||
info->DataType == GL_INT ||
info->DataType == GL_FLOAT); info->DataType == GL_FLOAT);
if (info->BaseFormat == GL_RGB) { if (info->BaseFormat == GL_RGB) {