diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2005-01-06 14:35:44 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2005-01-06 14:35:44 +0000 |
| commit | a2db56b34b7fe0fb58441d293ba56b8ed48141a8 (patch) | |
| tree | ae1ede85df888975714ed214757e4c7cee9206b4 /src/mesa/drivers/dri/i915/intel_tex.c | |
| parent | 9f149bf2068c8897497d2b795006ae7334cfc3f6 (diff) | |
Add Intel i915GM support, and these extensions.
* GL_ARB_texture_cube_map
* GL_EXT_blend_equation_separate
* GL_ATI_blend_equation_separate
* GL_ARB_point_parameters
* GL_NV_blend_square
* GL_EXT_cull_vertex
* GL_ARB_depth_texture
* GL_SGIX_depth_texture
* GL_ARB_shadow
* GL_EXT_shadow_funcs
* GL_3DFX_texture_compression_FXT1
(Keith Whitwell, Tungsten Graphics)
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index b6b8188275..5fc904e601 100644 --- a/src/mesa/drivers/dri/i915/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c @@ -28,6 +28,7 @@ #include "glheader.h" #include "mtypes.h" #include "imports.h" +#include "macros.h" #include "simple_list.h" #include "enums.h" #include "image.h" @@ -509,10 +510,7 @@ intelChooseTextureFormat( GLcontext *ctx, GLint internalFormat, case GL_ALPHA12: case GL_ALPHA16: case GL_COMPRESSED_ALPHA: -/* if (1 || intel->intelScreen->deviceID == PCI_CHIP_I915_G) */ - return &_mesa_texformat_a8; -/* else */ -/* return &_mesa_texformat_al88; */ + return &_mesa_texformat_a8; case 1: case GL_LUMINANCE: @@ -570,8 +568,16 @@ intelChooseTextureFormat( GLcontext *ctx, GLint internalFormat, case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: return &_mesa_texformat_rgba_dxt5; + case GL_DEPTH_COMPONENT: + case GL_DEPTH_COMPONENT16: + case GL_DEPTH_COMPONENT24: + case GL_DEPTH_COMPONENT32: + return &_mesa_texformat_depth_component16; + default: - fprintf(stderr, "unexpected texture format in %s\n", __FUNCTION__); + fprintf(stderr, "unexpected texture format %s in %s\n", + _mesa_lookup_enum_by_nr(internalFormat), + __FUNCTION__); return NULL; } |