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

Fix and enable GL_MESA_ycbcr_texture. Looks fine with yuvrect. I'm slightly

Browse source 
concerned that TEXEL_YUV422 looks like TEXEL_YVU422 and TEXEL_VUY422 looks like
TEXEL_VYU422 in yuvrect, but I'm happy enough for now.
This commit is contained in:
Eric Anholt 2005-10-24 22:01:40 +00:00
parent 81d3bf58ff
commit f33beed330
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/sis/sis_context.c
View file

@ -81,7 +81,7 @@ struct dri_extension card_extensions[] =
{ "GL_EXT_texture_lod_bias", NULL }, { "GL_EXT_texture_lod_bias", NULL },
{ "GL_EXT_secondary_color", GL_EXT_secondary_color_functions }, { "GL_EXT_secondary_color", GL_EXT_secondary_color_functions },
{ "GL_EXT_stencil_wrap", NULL }, { "GL_EXT_stencil_wrap", NULL },
/*{ "GL_MESA_ycbcr_texture", NULL },*/ /* not working yet */ { "GL_MESA_ycbcr_texture", NULL },
{ "GL_NV_blend_square", NULL }, { "GL_NV_blend_square", NULL },
{ NULL, NULL } { NULL, NULL }
}; };

4
src/mesa/drivers/dri/sis/sis_tex.c
View file

@ -96,10 +96,10 @@ sisAllocTexImage( sisContextPtr smesa, sisTexObjPtr t, int level,
t->hwformat = TEXEL_AL88; t->hwformat = TEXEL_AL88;
break; break;
case MESA_FORMAT_YCBCR: case MESA_FORMAT_YCBCR:
t->hwformat = TEXEL_YVU422; /* Doesn't work? Extension disabled */ t->hwformat = TEXEL_YUV422;
break; break;
case MESA_FORMAT_YCBCR_REV: case MESA_FORMAT_YCBCR_REV:
t->hwformat = TEXEL_YUV422; /* Doesn't work? Extension disabled */ t->hwformat = TEXEL_VUY422;
break; break;
default: default:
sis_fatal_error("Bad texture format 0x%x.\n", sis_fatal_error("Bad texture format 0x%x.\n",

30
src/mesa/drivers/dri/sis/sis_texstate.c
View file

@ -73,6 +73,7 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
break; break;
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor0 = STAGE0_C_CS; current->hwTexBlendColor0 = STAGE0_C_CS;
current->hwTexBlendAlpha0 = STAGE0_A_AF; current->hwTexBlendAlpha0 = STAGE0_A_AF;
break; break;
@ -82,6 +83,8 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor0 = STAGE0_C_CS; current->hwTexBlendColor0 = STAGE0_C_CS;
current->hwTexBlendAlpha0 = STAGE0_A_AS; current->hwTexBlendAlpha0 = STAGE0_A_AS;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
@ -94,6 +97,7 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
break; break;
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor0 = STAGE0_C_CFCS; current->hwTexBlendColor0 = STAGE0_C_CFCS;
current->hwTexBlendAlpha0 = STAGE0_A_AF; current->hwTexBlendAlpha0 = STAGE0_A_AF;
break; break;
@ -103,6 +107,8 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor0 = STAGE0_C_CFCS; current->hwTexBlendColor0 = STAGE0_C_CFCS;
current->hwTexBlendAlpha0 = STAGE0_A_AFAS; current->hwTexBlendAlpha0 = STAGE0_A_AFAS;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
@ -110,6 +116,7 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
switch (t->format) switch (t->format)
{ {
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor0 = STAGE0_C_CS; current->hwTexBlendColor0 = STAGE0_C_CS;
current->hwTexBlendAlpha0 = STAGE0_A_AF; current->hwTexBlendAlpha0 = STAGE0_A_AF;
break; break;
@ -117,6 +124,8 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor0 = STAGE0_C_CFOMAS_CSAS; current->hwTexBlendColor0 = STAGE0_C_CFOMAS_CSAS;
current->hwTexBlendAlpha0 = STAGE0_A_AF; current->hwTexBlendAlpha0 = STAGE0_A_AF;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
@ -134,6 +143,7 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
break; break;
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor0 = STAGE0_C_CFOMCS_CCCS; current->hwTexBlendColor0 = STAGE0_C_CFOMCS_CCCS;
current->hwTexBlendAlpha0 = STAGE0_A_AF; current->hwTexBlendAlpha0 = STAGE0_A_AF;
break; break;
@ -146,8 +156,13 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor0 = STAGE0_C_CFOMCS_CCCS; current->hwTexBlendColor0 = STAGE0_C_CFOMCS_CCCS;
current->hwTexBlendAlpha0 = STAGE0_A_AFAS; current->hwTexBlendAlpha0 = STAGE0_A_AFAS;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
default:
sis_fatal_error("unknown env mode 0x%x\n", texture_unit->EnvMode);
} }
if ((current->hwTexBlendColor0 != prev->hwTexBlendColor0) || if ((current->hwTexBlendColor0 != prev->hwTexBlendColor0) ||
@ -187,6 +202,7 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
break; break;
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor1 = STAGE1_C_CS; current->hwTexBlendColor1 = STAGE1_C_CS;
current->hwTexBlendAlpha1 = STAGE1_A_AF; current->hwTexBlendAlpha1 = STAGE1_A_AF;
break; break;
@ -196,6 +212,8 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor1 = STAGE1_C_CS; current->hwTexBlendColor1 = STAGE1_C_CS;
current->hwTexBlendAlpha1 = STAGE1_A_AS; current->hwTexBlendAlpha1 = STAGE1_A_AS;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
@ -208,6 +226,7 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
break; break;
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor1 = STAGE1_C_CFCS; current->hwTexBlendColor1 = STAGE1_C_CFCS;
current->hwTexBlendAlpha1 = STAGE1_A_AF; current->hwTexBlendAlpha1 = STAGE1_A_AF;
break; break;
@ -217,6 +236,8 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor1 = STAGE1_C_CFCS; current->hwTexBlendColor1 = STAGE1_C_CFCS;
current->hwTexBlendAlpha1 = STAGE1_A_AFAS; current->hwTexBlendAlpha1 = STAGE1_A_AFAS;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
@ -224,6 +245,7 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
switch (t->format) switch (t->format)
{ {
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor1 = STAGE1_C_CS; current->hwTexBlendColor1 = STAGE1_C_CS;
current->hwTexBlendAlpha1 = STAGE1_A_AF; current->hwTexBlendAlpha1 = STAGE1_A_AF;
break; break;
@ -231,6 +253,8 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor1 = STAGE1_C_CFOMAS_CSAS; current->hwTexBlendColor1 = STAGE1_C_CFOMAS_CSAS;
current->hwTexBlendAlpha1 = STAGE1_A_AF; current->hwTexBlendAlpha1 = STAGE1_A_AF;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
@ -248,6 +272,7 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
break; break;
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_RGB: case GL_RGB:
case GL_YCBCR_MESA:
current->hwTexBlendColor1 = STAGE1_C_CFOMCS_CCCS; current->hwTexBlendColor1 = STAGE1_C_CFOMCS_CCCS;
current->hwTexBlendAlpha1 = STAGE1_A_AF; current->hwTexBlendAlpha1 = STAGE1_A_AF;
break; break;
@ -260,8 +285,13 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor1 = STAGE1_C_CFOMCS_CCCS; current->hwTexBlendColor1 = STAGE1_C_CFOMCS_CCCS;
current->hwTexBlendAlpha1 = STAGE1_A_AFAS; current->hwTexBlendAlpha1 = STAGE1_A_AFAS;
break; break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
} }
break; break;
default:
sis_fatal_error("unknown env mode 0x%x\n", texture_unit->EnvMode);
} }
if ((current->hwTexBlendColor1 != prev->hwTexBlendColor1) || if ((current->hwTexBlendColor1 != prev->hwTexBlendColor1) ||