Skip to content

S
swiftshader
Commit 1abb6380 by Alexis Hetu Committed by Alexis Hétu
Options

Added 32 bit integer output types

As long as there's no floating point arithmetic, 32 bit integer types are computationally equivalent to 32 bit floating point. Change-Id: I5ab19da440f52617a9bc64dff6fcaf8eff796aeb Reviewed-on: https://swiftshader-review.googlesource.com/4717Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent ed7fdfe2
Showing with 73 additions and 5 deletions
src/OpenGL/common/Image.cpp
...@@ -500,6 +500,30 @@ namespace egl ...@@ -500,6 +500,30 @@ namespace egl
return sw::FORMAT_A16F; return sw::FORMAT_A16F;
case GL_ALPHA32F_EXT: case GL_ALPHA32F_EXT:
return sw::FORMAT_A32F; return sw::FORMAT_A32F;
case GL_RED_INTEGER:
switch(type)
{
case GL_INT: return sw::FORMAT_R32I;
case GL_UNSIGNED_INT: return sw::FORMAT_R32UI;
default: UNREACHABLE(type);
}
break;
case GL_RG_INTEGER:
switch(type)
{
case GL_INT: return sw::FORMAT_G32R32I;
case GL_UNSIGNED_INT: return sw::FORMAT_G32R32UI;
default: UNREACHABLE(type);
}
break;
case GL_RGBA_INTEGER:
switch(type)
{
case GL_INT: return sw::FORMAT_A32B32G32R32I;
case GL_UNSIGNED_INT: return sw::FORMAT_A32B32G32R32UI;
default: UNREACHABLE(type);
}
break;
default: default:
UNREACHABLE(format); UNREACHABLE(format);
} }
......
src/Shader/PixelProgram.cpp
...@@ -598,6 +598,12 @@ namespace sw ...@@ -598,6 +598,12 @@ namespace sw
case FORMAT_R32F: case FORMAT_R32F:
case FORMAT_G32R32F: case FORMAT_G32R32F:
case FORMAT_A32B32G32R32F: case FORMAT_A32B32G32R32F:
case FORMAT_R32I:
case FORMAT_G32R32I:
case FORMAT_A32B32G32R32I:
case FORMAT_R32UI:
case FORMAT_G32R32UI:
case FORMAT_A32B32G32R32UI:
for(unsigned int q = 0; q < state.multiSample; q++) for(unsigned int q = 0; q < state.multiSample; q++)
{ {
Pointer<Byte> buffer = cBuffer[index] + q * *Pointer<Int>(data + OFFSET(DrawData, colorSliceB[index])); Pointer<Byte> buffer = cBuffer[index] + q * *Pointer<Int>(data + OFFSET(DrawData, colorSliceB[index]));
...@@ -697,6 +703,12 @@ namespace sw ...@@ -697,6 +703,12 @@ namespace sw
case FORMAT_R32F: case FORMAT_R32F:
case FORMAT_G32R32F: case FORMAT_G32R32F:
case FORMAT_A32B32G32R32F: case FORMAT_A32B32G32R32F:
case FORMAT_R32I:
case FORMAT_G32R32I:
case FORMAT_A32B32G32R32I:
case FORMAT_R32UI:
case FORMAT_G32R32UI:
case FORMAT_A32B32G32R32UI:
break; break;
default: default:
ASSERT(false); ASSERT(false);
......
src/Shader/PixelRoutine.cpp
...@@ -1961,8 +1961,27 @@ namespace sw ...@@ -1961,8 +1961,27 @@ namespace sw
Short4 c01; Short4 c01;
Short4 c23; Short4 c23;
Float4 one;
switch(state.targetFormat[index]) switch(state.targetFormat[index])
{ {
case FORMAT_R32I:
case FORMAT_G32R32I:
one = As<Float4>(Int4(0x7FFFFFFF));
break;
case FORMAT_R32UI:
case FORMAT_G32R32UI:
one = As<Float4>(Int4(0xFFFFFFFF));
break;
case FORMAT_R32F:
case FORMAT_G32R32F:
one = Float4(1.0f);
break;
}
switch(state.targetFormat[index])
{
case FORMAT_R32I:
case FORMAT_R32UI:
case FORMAT_R32F: case FORMAT_R32F:
buffer = cBuffer; buffer = cBuffer;
// FIXME: movlps // FIXME: movlps
...@@ -1972,10 +1991,10 @@ namespace sw ...@@ -1972,10 +1991,10 @@ namespace sw
// FIXME: movhps // FIXME: movhps
pixel.x.z = *Pointer<Float>(buffer + 4 * x + 0); pixel.x.z = *Pointer<Float>(buffer + 4 * x + 0);
pixel.x.w = *Pointer<Float>(buffer + 4 * x + 4); pixel.x.w = *Pointer<Float>(buffer + 4 * x + 4);
pixel.y = Float4(1.0f); pixel.y = pixel.z = pixel.w = one;
pixel.z = Float4(1.0f);
pixel.w = Float4(1.0f);
break; break;
case FORMAT_G32R32I:
case FORMAT_G32R32UI:
case FORMAT_G32R32F: case FORMAT_G32R32F:
buffer = cBuffer; buffer = cBuffer;
pixel.x = *Pointer<Float4>(buffer + 8 * x, 16); pixel.x = *Pointer<Float4>(buffer + 8 * x, 16);
...@@ -1985,10 +2004,11 @@ namespace sw ...@@ -1985,10 +2004,11 @@ namespace sw
pixel.x = ShuffleLowHigh(pixel.x, pixel.y, 0x88); pixel.x = ShuffleLowHigh(pixel.x, pixel.y, 0x88);
pixel.z = ShuffleLowHigh(pixel.z, pixel.y, 0xDD); pixel.z = ShuffleLowHigh(pixel.z, pixel.y, 0xDD);
pixel.y = pixel.z; pixel.y = pixel.z;
pixel.z = Float4(1.0f); pixel.z = pixel.w = one;
pixel.w = Float4(1.0f);
break; break;
case FORMAT_A32B32G32R32F: case FORMAT_A32B32G32R32F:
case FORMAT_A32B32G32R32I:
case FORMAT_A32B32G32R32UI:
buffer = cBuffer; buffer = cBuffer;
pixel.x = *Pointer<Float4>(buffer + 16 * x, 16); pixel.x = *Pointer<Float4>(buffer + 16 * x, 16);
pixel.y = *Pointer<Float4>(buffer + 16 * x + 16, 16); pixel.y = *Pointer<Float4>(buffer + 16 * x + 16, 16);
...@@ -2123,14 +2143,20 @@ namespace sw ...@@ -2123,14 +2143,20 @@ namespace sw
switch(state.targetFormat[index]) switch(state.targetFormat[index])
{ {
case FORMAT_R32F: case FORMAT_R32F:
case FORMAT_R32I:
case FORMAT_R32UI:
break; break;
case FORMAT_G32R32F: case FORMAT_G32R32F:
case FORMAT_G32R32I:
case FORMAT_G32R32UI:
oC.z = oC.x; oC.z = oC.x;
oC.x = UnpackLow(oC.x, oC.y); oC.x = UnpackLow(oC.x, oC.y);
oC.z = UnpackHigh(oC.z, oC.y); oC.z = UnpackHigh(oC.z, oC.y);
oC.y = oC.z; oC.y = oC.z;
break; break;
case FORMAT_A32B32G32R32F: case FORMAT_A32B32G32R32F:
case FORMAT_A32B32G32R32I:
case FORMAT_A32B32G32R32UI:
transpose4x4(oC.x, oC.y, oC.z, oC.w); transpose4x4(oC.x, oC.y, oC.z, oC.w);
break; break;
default: default:
...@@ -2161,6 +2187,8 @@ namespace sw ...@@ -2161,6 +2187,8 @@ namespace sw
switch(state.targetFormat[index]) switch(state.targetFormat[index])
{ {
case FORMAT_R32F: case FORMAT_R32F:
case FORMAT_R32I:
case FORMAT_R32UI:
if(rgbaWriteMask & 0x00000001) if(rgbaWriteMask & 0x00000001)
{ {
buffer = cBuffer + 4 * x; buffer = cBuffer + 4 * x;
...@@ -2191,6 +2219,8 @@ namespace sw ...@@ -2191,6 +2219,8 @@ namespace sw
} }
break; break;
case FORMAT_G32R32F: case FORMAT_G32R32F:
case FORMAT_G32R32I:
case FORMAT_G32R32UI:
buffer = cBuffer + 8 * x; buffer = cBuffer + 8 * x;
value = *Pointer<Float4>(buffer); value = *Pointer<Float4>(buffer);
...@@ -2228,6 +2258,8 @@ namespace sw ...@@ -2228,6 +2258,8 @@ namespace sw
*Pointer<Float4>(buffer) = oC.y; *Pointer<Float4>(buffer) = oC.y;
break; break;
case FORMAT_A32B32G32R32F: case FORMAT_A32B32G32R32F:
case FORMAT_A32B32G32R32I:
case FORMAT_A32B32G32R32UI:
buffer = cBuffer + 16 * x; buffer = cBuffer + 16 * x;
{ {
......
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