Skip to content

S
swiftshader
Commit cd0af645 by Nicolas Capens Committed by Nicolas Capens
Options

Remove dead ASTC code for GLES

Surface::decodeASTC() was empty, and ENABLE_ASTC hard-coded to 0, so we never actually supported ASTC for OpenGL ES. We won't need it in the future since this legacy code is deprecated and set to be replaced by SwANGLE (which supports ASTC LDR at the moment). Also note ASTC LDR doesn't become mandatory until OpenGL ES 3.2, and this legacy code lacks compute shaders to even support ES 3.1. Bug: b/147536183 Change-Id: I61fe83214cfebe9f83bd49334474e095631af3e7 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46350 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent be1a9ac6
Showing with 3 additions and 166 deletions
src/Main/Config.hpp
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#define PERF_HUD 0 // Display time spent on vertex, setup and pixel processing for each thread #define PERF_HUD 0 // Display time spent on vertex, setup and pixel processing for each thread
#define PERF_PROFILE 0 // Profile various pipeline stages and display the timing in SwiftConfig #define PERF_PROFILE 0 // Profile various pipeline stages and display the timing in SwiftConfig
#define ASTC_SUPPORT 0
// Worker thread count when not set by SwiftConfig // Worker thread count when not set by SwiftConfig
// 0 = process affinity count (recommended) // 0 = process affinity count (recommended)
// 1 = rendering on main thread (no worker threads), useful for debugging // 1 = rendering on main thread (no worker threads), useful for debugging
......
src/OpenGL/common/Image.cpp
...@@ -375,34 +375,6 @@ namespace gl ...@@ -375,34 +375,6 @@ namespace gl
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: return sw::FORMAT_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2; case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: return sw::FORMAT_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
case GL_COMPRESSED_RGBA8_ETC2_EAC: return sw::FORMAT_RGBA8_ETC2_EAC; case GL_COMPRESSED_RGBA8_ETC2_EAC: return sw::FORMAT_RGBA8_ETC2_EAC;
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: return sw::FORMAT_SRGB8_ALPHA8_ETC2_EAC; case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: return sw::FORMAT_SRGB8_ALPHA8_ETC2_EAC;
case GL_COMPRESSED_RGBA_ASTC_4x4_KHR: return sw::FORMAT_RGBA_ASTC_4x4_KHR;
case GL_COMPRESSED_RGBA_ASTC_5x4_KHR: return sw::FORMAT_RGBA_ASTC_5x4_KHR;
case GL_COMPRESSED_RGBA_ASTC_5x5_KHR: return sw::FORMAT_RGBA_ASTC_5x5_KHR;
case GL_COMPRESSED_RGBA_ASTC_6x5_KHR: return sw::FORMAT_RGBA_ASTC_6x5_KHR;
case GL_COMPRESSED_RGBA_ASTC_6x6_KHR: return sw::FORMAT_RGBA_ASTC_6x6_KHR;
case GL_COMPRESSED_RGBA_ASTC_8x5_KHR: return sw::FORMAT_RGBA_ASTC_8x5_KHR;
case GL_COMPRESSED_RGBA_ASTC_8x6_KHR: return sw::FORMAT_RGBA_ASTC_8x6_KHR;
case GL_COMPRESSED_RGBA_ASTC_8x8_KHR: return sw::FORMAT_RGBA_ASTC_8x8_KHR;
case GL_COMPRESSED_RGBA_ASTC_10x5_KHR: return sw::FORMAT_RGBA_ASTC_10x5_KHR;
case GL_COMPRESSED_RGBA_ASTC_10x6_KHR: return sw::FORMAT_RGBA_ASTC_10x6_KHR;
case GL_COMPRESSED_RGBA_ASTC_10x8_KHR: return sw::FORMAT_RGBA_ASTC_10x8_KHR;
case GL_COMPRESSED_RGBA_ASTC_10x10_KHR: return sw::FORMAT_RGBA_ASTC_10x10_KHR;
case GL_COMPRESSED_RGBA_ASTC_12x10_KHR: return sw::FORMAT_RGBA_ASTC_12x10_KHR;
case GL_COMPRESSED_RGBA_ASTC_12x12_KHR: return sw::FORMAT_RGBA_ASTC_12x12_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_4x4_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_5x4_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_5x5_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_6x5_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_6x6_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_8x5_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_8x6_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_8x8_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_10x5_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_10x6_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_10x8_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_10x10_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_12x10_KHR;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR: return sw::FORMAT_SRGB8_ALPHA8_ASTC_12x12_KHR;
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: return sw::FORMAT_DXT1; case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: return sw::FORMAT_DXT1;
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: return sw::FORMAT_DXT1; case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: return sw::FORMAT_DXT1;
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE: return sw::FORMAT_DXT3; case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE: return sw::FORMAT_DXT3;
...@@ -584,48 +556,7 @@ namespace gl ...@@ -584,48 +556,7 @@ namespace gl
case GL_COMPRESSED_SIGNED_RG11_EAC: case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGBA8_ETC2_EAC: case GL_COMPRESSED_RGBA8_ETC2_EAC:
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
return 16 * GetNumCompressedBlocks(width, height, 4, 4); return 16 * GetNumCompressedBlocks(width, height, 4, 4);
case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
return 16 * GetNumCompressedBlocks(width, height, 5, 4);
case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
return 16 * GetNumCompressedBlocks(width, height, 5, 5);
case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
return 16 * GetNumCompressedBlocks(width, height, 6, 5);
case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
return 16 * GetNumCompressedBlocks(width, height, 6, 6);
case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
return 16 * GetNumCompressedBlocks(width, height, 8, 5);
case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
return 16 * GetNumCompressedBlocks(width, height, 8, 6);
case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
return 16 * GetNumCompressedBlocks(width, height, 8, 8);
case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
return 16 * GetNumCompressedBlocks(width, height, 10, 5);
case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
return 16 * GetNumCompressedBlocks(width, height, 10, 6);
case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
return 16 * GetNumCompressedBlocks(width, height, 10, 8);
case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
return 16 * GetNumCompressedBlocks(width, height, 10, 10);
case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
return 16 * GetNumCompressedBlocks(width, height, 12, 10);
case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
return 16 * GetNumCompressedBlocks(width, height, 12, 12);
default: default:
UNREACHABLE(format); UNREACHABLE(format);
return 0; return 0;
......
src/OpenGL/libGLES_CM/libGLES_CM.hpp
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include "Common/SharedLibrary.hpp" #include "Common/SharedLibrary.hpp"
#include "Renderer/Surface.hpp"
namespace sw namespace sw
{ {
class FrameBuffer; class FrameBuffer;
enum Format : unsigned char;
} }
namespace egl namespace egl
......
src/OpenGL/libGLESv2/Context.cpp
...@@ -4532,10 +4532,6 @@ const GLubyte *Context::getExtensions(GLuint index, GLuint *numExt) const ...@@ -4532,10 +4532,6 @@ const GLubyte *Context::getExtensions(GLuint index, GLuint *numExt) const
"GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_filter_anisotropic",
"GL_EXT_texture_format_BGRA8888", "GL_EXT_texture_format_BGRA8888",
"GL_EXT_texture_rg", "GL_EXT_texture_rg",
#if (ASTC_SUPPORT)
"GL_KHR_texture_compression_astc_hdr",
"GL_KHR_texture_compression_astc_ldr",
#endif
"GL_ARB_texture_rectangle", "GL_ARB_texture_rectangle",
"GL_ANGLE_framebuffer_blit", "GL_ANGLE_framebuffer_blit",
"GL_ANGLE_framebuffer_multisample", "GL_ANGLE_framebuffer_multisample",
......
src/OpenGL/libGLESv2/Context.h
...@@ -126,36 +126,6 @@ const GLenum compressedTextureFormats[] = ...@@ -126,36 +126,6 @@ const GLenum compressedTextureFormats[] =
GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
GL_COMPRESSED_RGBA8_ETC2_EAC, GL_COMPRESSED_RGBA8_ETC2_EAC,
GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
#if (ASTC_SUPPORT)
GL_COMPRESSED_RGBA_ASTC_4x4_KHR,
GL_COMPRESSED_RGBA_ASTC_5x4_KHR,
GL_COMPRESSED_RGBA_ASTC_5x5_KHR,
GL_COMPRESSED_RGBA_ASTC_6x5_KHR,
GL_COMPRESSED_RGBA_ASTC_6x6_KHR,
GL_COMPRESSED_RGBA_ASTC_8x5_KHR,
GL_COMPRESSED_RGBA_ASTC_8x6_KHR,
GL_COMPRESSED_RGBA_ASTC_8x8_KHR,
GL_COMPRESSED_RGBA_ASTC_10x5_KHR,
GL_COMPRESSED_RGBA_ASTC_10x6_KHR,
GL_COMPRESSED_RGBA_ASTC_10x8_KHR,
GL_COMPRESSED_RGBA_ASTC_10x10_KHR,
GL_COMPRESSED_RGBA_ASTC_12x10_KHR,
GL_COMPRESSED_RGBA_ASTC_12x12_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR,
GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR,
#endif // ASTC_SUPPORT
#endif // GL_ES_VERSION_3_0 #endif // GL_ES_VERSION_3_0
}; };
......
src/OpenGL/libGLESv2/libGLESv2.hpp
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
namespace sw namespace sw
{ {
class FrameBuffer; class FrameBuffer;
enum Format : unsigned char; enum Format ENUM_UNDERLYING_TYPE_UNSIGNED_INT;
} }
namespace egl namespace egl
......
src/OpenGL/libGLESv2/utilities.cpp
...@@ -343,35 +343,6 @@ namespace es2 ...@@ -343,35 +343,6 @@ namespace es2
case GL_COMPRESSED_RGBA8_ETC2_EAC: case GL_COMPRESSED_RGBA8_ETC2_EAC:
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
return true; return true;
case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
return ASTC_SUPPORT;
default: default:
return false; return false;
} }
......
src/Renderer/Surface.hpp
...@@ -60,7 +60,7 @@ namespace sw ...@@ -60,7 +60,7 @@ namespace sw
typedef SliceRectT<int> SliceRect; typedef SliceRectT<int> SliceRect;
typedef SliceRectT<float> SliceRectF; typedef SliceRectT<float> SliceRectF;
enum Format : unsigned char enum Format ENUM_UNDERLYING_TYPE_UNSIGNED_INT
{ {
FORMAT_NULL, FORMAT_NULL,
...@@ -137,34 +137,6 @@ namespace sw ...@@ -137,34 +137,6 @@ namespace sw
FORMAT_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, FORMAT_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
FORMAT_RGBA8_ETC2_EAC, FORMAT_RGBA8_ETC2_EAC,
FORMAT_SRGB8_ALPHA8_ETC2_EAC, FORMAT_SRGB8_ALPHA8_ETC2_EAC,
FORMAT_RGBA_ASTC_4x4_KHR,
FORMAT_RGBA_ASTC_5x4_KHR,
FORMAT_RGBA_ASTC_5x5_KHR,
FORMAT_RGBA_ASTC_6x5_KHR,
FORMAT_RGBA_ASTC_6x6_KHR,
FORMAT_RGBA_ASTC_8x5_KHR,
FORMAT_RGBA_ASTC_8x6_KHR,
FORMAT_RGBA_ASTC_8x8_KHR,
FORMAT_RGBA_ASTC_10x5_KHR,
FORMAT_RGBA_ASTC_10x6_KHR,
FORMAT_RGBA_ASTC_10x8_KHR,
FORMAT_RGBA_ASTC_10x10_KHR,
FORMAT_RGBA_ASTC_12x10_KHR,
FORMAT_RGBA_ASTC_12x12_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_4x4_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_5x4_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_5x5_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_6x5_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_6x6_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_8x5_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_8x6_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_8x8_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_10x5_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_10x6_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_10x8_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_10x10_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_12x10_KHR,
FORMAT_SRGB8_ALPHA8_ASTC_12x12_KHR,
// Floating-point formats // Floating-point formats
FORMAT_A16F, FORMAT_A16F,
FORMAT_R16F, FORMAT_R16F,
...@@ -479,7 +451,6 @@ namespace sw ...@@ -479,7 +451,6 @@ namespace sw
static void decodeATI2(Buffer &internal, Buffer &external); static void decodeATI2(Buffer &internal, Buffer &external);
static void decodeEAC(Buffer &internal, Buffer &external, int nbChannels, bool isSigned); static void decodeEAC(Buffer &internal, Buffer &external, int nbChannels, bool isSigned);
static void decodeETC2(Buffer &internal, Buffer &external, int nbAlphaBits, bool isSRGB); static void decodeETC2(Buffer &internal, Buffer &external, int nbAlphaBits, bool isSRGB);
static void decodeASTC(Buffer &internal, Buffer &external, int xSize, int ySize, int zSize, bool isSRGB);
static void update(Buffer &destination, Buffer &source); static void update(Buffer &destination, Buffer &source);
static void genericUpdate(Buffer &destination, Buffer &source); static void genericUpdate(Buffer &destination, Buffer &source);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment