Some minor code tidying.
These were part of a larger stack of changes for Yarn, but aren't specific to anything in particular.
Change-Id: I863d8bbb316b5c255be9557b83511bb9cdef70b0
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35570
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Device/Primitive.hpp b/src/Device/Primitive.hpp
index 1dbc4a6..ba4dc03 100644
--- a/src/Device/Primitive.hpp
+++ b/src/Device/Primitive.hpp
@@ -47,11 +47,7 @@
PlaneEquation z;
PlaneEquation w;
-
- union
- {
- PlaneEquation V[MAX_INTERFACE_COMPONENTS];
- };
+ PlaneEquation V[MAX_INTERFACE_COMPONENTS];
// Masks for two-sided stencil
int64_t clockwiseMask;
diff --git a/src/Device/VertexProcessor.hpp b/src/Device/VertexProcessor.hpp
index 24a9b3f..9133cb6 100644
--- a/src/Device/VertexProcessor.hpp
+++ b/src/Device/VertexProcessor.hpp
@@ -36,7 +36,10 @@
Vertex vertex[SIZE];
uint32_t tag[SIZE];
- int drawCall;
+ // Identifier of the draw call for the cache data. If this cache is
+ // used with a different draw call, then the cache should be invalidated
+ // before use.
+ int drawCall = -1;
};
struct VertexTask
diff --git a/src/Main/FrameBufferAndroid.hpp b/src/Main/FrameBufferAndroid.hpp
index b71c32b..2e9924c 100644
--- a/src/Main/FrameBufferAndroid.hpp
+++ b/src/Main/FrameBufferAndroid.hpp
@@ -30,7 +30,7 @@
~FrameBufferAndroid() override;
- void flip(sw::Surface *source) override {blit(source, nullptr, nullptr);};
+ void flip(sw::Surface *source) override {blit(source, nullptr, nullptr);}
void blit(sw::Surface *source, const Rect *sourceRect, const Rect *destRect) override;
void *lock() override;
