Removed unused texture data
Bug: b/129523279
Change-Id: Ifdb1409cf7339ac16b6fe890bc014a2e43801c76
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30431
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
diff --git a/src/Device/Config.hpp b/src/Device/Config.hpp
index d3b4889..bfd8a3b 100644
--- a/src/Device/Config.hpp
+++ b/src/Device/Config.hpp
@@ -77,9 +77,6 @@
{
OUTLINE_RESOLUTION = 8192, // Maximum vertical resolution of the render target
MIPMAP_LEVELS = 14,
- TEXTURE_IMAGE_UNITS = 16,
- VERTEX_TEXTURE_IMAGE_UNITS = 16,
- TOTAL_IMAGE_UNITS = TEXTURE_IMAGE_UNITS + VERTEX_TEXTURE_IMAGE_UNITS,
FRAGMENT_UNIFORM_VECTORS = 264,
VERTEX_UNIFORM_VECTORS = 259,
MAX_VERTEX_INPUTS = 32,
diff --git a/src/Device/PixelProcessor.hpp b/src/Device/PixelProcessor.hpp
index 6eb8220..cf0eb5e 100644
--- a/src/Device/PixelProcessor.hpp
+++ b/src/Device/PixelProcessor.hpp
@@ -64,8 +64,6 @@
bool centroid;
bool frontFaceCCW;
VkFormat depthFormat;
-
- Sampler sampler[TEXTURE_IMAGE_UNITS];
};
struct State : States
diff --git a/src/Device/Renderer.hpp b/src/Device/Renderer.hpp
index a10187a..aa513d6 100644
--- a/src/Device/Renderer.hpp
+++ b/src/Device/Renderer.hpp
@@ -92,7 +92,6 @@
const void *input[MAX_VERTEX_INPUTS];
unsigned int stride[MAX_VERTEX_INPUTS];
- Texture mipmap[TOTAL_IMAGE_UNITS];
const void *indices;
int instanceID;
diff --git a/src/Device/Sampler.hpp b/src/Device/Sampler.hpp
index 2347fe0..752d018 100644
--- a/src/Device/Sampler.hpp
+++ b/src/Device/Sampler.hpp
@@ -148,7 +148,6 @@
AddressingMode addressingModeV;
AddressingMode addressingModeW;
MipmapType mipmapFilter;
- bool sRGB;
VkComponentMapping swizzle;
bool highPrecisionFiltering;
CompareFunc compare;
diff --git a/src/Device/VertexProcessor.hpp b/src/Device/VertexProcessor.hpp
index 0c04b6c..dedcf97 100644
--- a/src/Device/VertexProcessor.hpp
+++ b/src/Device/VertexProcessor.hpp
@@ -53,8 +53,6 @@
bool textureSampling : 1; // TODO: Eliminate by querying shader.
unsigned char verticesPerPrimitive : 2; // 1 (points), 2 (lines) or 3 (triangles)
- Sampler sampler[VERTEX_TEXTURE_IMAGE_UNITS];
-
struct Input
{
operator bool() const // Returns true if stream contains data
