gallium: add some #if FEATURE_x tests

This commit is contained in:
Brian Paul
2008-06-12 16:54:44 -06:00
parent 6363960db5
commit 5b51cc020e
3 changed files with 10 additions and 0 deletions

View File

@@ -106,5 +106,7 @@ st_BlitFramebuffer(GLcontext *ctx,
void
st_init_blit_functions(struct dd_function_table *functions)
{
#if FEATURE_EXT_framebuffer_blit
functions->BlitFramebuffer = st_BlitFramebuffer;
#endif
}

View File

@@ -97,14 +97,18 @@ static int
compressed_num_bytes(GLuint mesaFormat)
{
switch(mesaFormat) {
#if FEATURE_texture_fxt1
case MESA_FORMAT_RGB_FXT1:
case MESA_FORMAT_RGBA_FXT1:
#endif
#if FEATURE_texture_s3tc
case MESA_FORMAT_RGB_DXT1:
case MESA_FORMAT_RGBA_DXT1:
return 2;
case MESA_FORMAT_RGBA_DXT3:
case MESA_FORMAT_RGBA_DXT5:
return 4;
#endif
default:
return 0;
}

View File

@@ -278,6 +278,7 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat)
return PIPE_FORMAT_S8Z24_UNORM;
case MESA_FORMAT_YCBCR:
return PIPE_FORMAT_YCBCR;
#if FEATURE_texture_s3tc
case MESA_FORMAT_RGB_DXT1:
return PIPE_FORMAT_DXT1_RGB;
case MESA_FORMAT_RGBA_DXT1:
@@ -286,6 +287,7 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat)
return PIPE_FORMAT_DXT3_RGBA;
case MESA_FORMAT_RGBA_DXT5:
return PIPE_FORMAT_DXT5_RGBA;
#endif
default:
assert(0);
return 0;
@@ -569,6 +571,7 @@ translate_gallium_format_to_mesa_format(enum pipe_format format)
return &_mesa_texformat_ycbcr;
case PIPE_FORMAT_YCBCR_REV:
return &_mesa_texformat_ycbcr_rev;
#if FEATURE_texture_s3tc
case PIPE_FORMAT_DXT1_RGB:
return &_mesa_texformat_rgb_dxt1;
case PIPE_FORMAT_DXT1_RGBA:
@@ -577,6 +580,7 @@ translate_gallium_format_to_mesa_format(enum pipe_format format)
return &_mesa_texformat_rgba_dxt3;
case PIPE_FORMAT_DXT5_RGBA:
return &_mesa_texformat_rgba_dxt5;
#endif
/* XXX add additional cases */
default:
assert(0);