Separate image depth and samples count.
Previously, multisampled images used the 'depth' member of 3D images
or 2D arrays as the number of samples. This caused rendering to a
layer of a 2D array to be interpreted as rendering to a multisampled
render target. This change adds a 'samples' member which is orthogonal
to 'depth'.
Note that write operations put the same color into each of the samples,
while read operations (still) assume multisampled images have been
resolved into the first slice.
Change-Id: Ib33a0cf8194e19fcbb569b0c257ba1e1bd9c4821
Reviewed-on: https://swiftshader-review.googlesource.com/14808
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Renderer/Surface.hpp b/src/Renderer/Surface.hpp
index 16aa24e..7ea7bee 100644
--- a/src/Renderer/Surface.hpp
+++ b/src/Renderer/Surface.hpp
@@ -48,7 +48,7 @@
typedef RectT<int> Rect;
typedef RectT<float> RectF;
- template <typename T> struct SliceRectT : public RectT<T>
+ template<typename T> struct SliceRectT : public RectT<T>
{
SliceRectT() : slice(0) {}
SliceRectT(const RectT<T>& rect) : RectT<T>(rect), slice(0) {}
@@ -237,7 +237,9 @@
private:
struct Buffer
{
- public:
+ friend Surface;
+
+ private:
void write(int x, int y, int z, const Color<float> &color);
void write(int x, int y, const Color<float> &color);
void write(void *element, const Color<float> &color);
@@ -245,7 +247,7 @@
Color<float> read(int x, int y) const;
Color<float> read(void *element) const;
Color<float> sample(float x, float y, float z) const;
- Color<float> sample(float x, float y) const;
+ Color<float> sample(float x, float y, int layer) const;
void *lockRect(int x, int y, int z, Lock lock);
void unlockRect();
@@ -254,12 +256,15 @@
int width;
int height;
int depth;
+ short border;
+ short samples;
+
int bytes;
int pitchB;
int pitchP;
int sliceB;
int sliceP;
- int border;
+
Format format;
AtomicInt lock;
@@ -268,11 +273,11 @@
protected:
Surface(int width, int height, int depth, Format format, void *pixels, int pitch, int slice);
- Surface(Resource *texture, int width, int height, int depth, int border, Format format, bool lockable, bool renderTarget, int pitchP = 0);
+ Surface(Resource *texture, int width, int height, int depth, int border, int samples, Format format, bool lockable, bool renderTarget, int pitchP = 0);
public:
static Surface *create(int width, int height, int depth, Format format, void *pixels, int pitch, int slice);
- static Surface *create(Resource *texture, int width, int height, int depth, int border, Format format, bool lockable, bool renderTarget, int pitchP = 0);
+ static Surface *create(Resource *texture, int width, int height, int depth, int border, int samples, Format format, bool lockable, bool renderTarget, int pitchP = 0);
virtual ~Surface() = 0;
@@ -313,6 +318,7 @@
void sync(); // Wait for lock(s) to be released.
inline bool isUnlocked() const; // Only reliable after sync().
+ inline int getSamples() const;
inline int getMultiSampleCount() const;
inline int getSuperSampleCount() const;
@@ -351,7 +357,7 @@
static int pitchP(int width, int border, Format format, bool target);
static int sliceB(int width, int height, int border, Format format, bool target);
static int sliceP(int width, int height, int border, Format format, bool target);
- static unsigned int size(int width, int height, int depth, int border, Format format); // FIXME: slice * depth
+ static unsigned int size(int width, int height, int depth, int border, int samples, Format format); // FIXME: slice * depth
static bool isStencil(Format format);
static bool isDepth(Format format);
@@ -474,7 +480,7 @@
static void update(Buffer &destination, Buffer &source);
static void genericUpdate(Buffer &destination, Buffer &source);
- static void *allocateBuffer(int width, int height, int depth, int border, Format format);
+ static void *allocateBuffer(int width, int height, int depth, int border, int samples, Format format);
static void memfill4(void *buffer, int pattern, int bytes);
bool identicalFormats() const;
@@ -625,14 +631,19 @@
return stencil.sliceB;
}
+ int Surface::getSamples() const
+ {
+ return internal.samples;
+ }
+
int Surface::getMultiSampleCount() const
{
- return sw::min(internal.depth, 4);
+ return sw::min((int)internal.samples, 4);
}
int Surface::getSuperSampleCount() const
{
- return internal.depth > 4 ? internal.depth / 4 : 1;
+ return internal.samples > 4 ? internal.samples / 4 : 1;
}
bool Surface::isUnlocked() const
