diff options
| author | Jason Ekstrand <[email protected]> | 2014-06-27 09:40:10 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2014-06-30 12:02:25 -0700 |
| commit | 4000c0112a49c28793844f454278b50e00943173 (patch) | |
| tree | d398a8d1ecc3ae5f81b0f8259f68e549de2d279c /src/mesa/main/formats.c | |
| parent | 7577cdd8300068bdf1eda426951d7141450283aa (diff) | |
Remove the ATI_envmap_bumpmap extension
As far as I can tell, the Intel mesa driver is the only driver in the world
still supporting this legacy extension. If someone wants to do bump
mapping, they can use shaders.
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]> [v1]
Reviewed-by: Chris Forbes <[email protected]> [v2]
Reviewed-by: Ian Romanick <[email protected]> [v3]
Diffstat (limited to 'src/mesa/main/formats.c')
| -rw-r--r-- | src/mesa/main/formats.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 5c670115ef7..1f20a9a6ad1 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -43,7 +43,7 @@ struct gl_format_info /** * Base format is one of GL_RED, GL_RG, GL_RGB, GL_RGBA, GL_ALPHA, * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_YCBCR_MESA, - * GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_DEPTH_STENCIL, GL_DUDV_ATI. + * GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_DEPTH_STENCIL. */ GLenum BaseFormat; @@ -415,15 +415,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] = /* Array unorm formats */ { - MESA_FORMAT_DUDV8, - "MESA_FORMAT_DUDV8", - GL_DUDV_ATI, - GL_SIGNED_NORMALIZED, - 0, 0, 0, 0, - 0, 0, 0, 0, 0, - 1, 1, 2 - }, - { MESA_FORMAT_A_UNORM8, /* Name */ "MESA_FORMAT_A_UNORM8", /* StrName */ GL_ALPHA, /* BaseFormat */ @@ -2576,11 +2567,6 @@ _mesa_format_to_type_and_comps(mesa_format format, *comps = 1; return; - case MESA_FORMAT_DUDV8: - *datatype = GL_BYTE; - *comps = 2; - return; - case MESA_FORMAT_R_SNORM8: case MESA_FORMAT_A_SNORM8: case MESA_FORMAT_L_SNORM8: @@ -3387,10 +3373,6 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_RGBA_UINT32: return format == GL_RGBA_INTEGER && type == GL_UNSIGNED_INT && !swapBytes; - case MESA_FORMAT_DUDV8: - return (format == GL_DU8DV8_ATI || format == GL_DUDV_ATI) && - type == GL_BYTE && littleEndian && !swapBytes; - case MESA_FORMAT_R_SNORM8: return format == GL_RED && type == GL_BYTE; case MESA_FORMAT_R8G8_SNORM: |