OSDN Git Service

gl_VertexID implementation
[android-x86/external-swiftshader.git] / src / Shader / PixelProgram.cpp
index d39716f..948f103 100644 (file)
@@ -1,13 +1,16 @@
-// SwiftShader Software Renderer
+// Copyright 2016 The SwiftShader Authors. All Rights Reserved.
 //
-// Copyright(c) 2015 Google Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-// All rights reserved. No part of this software may be copied, distributed, transmitted,
-// transcribed, stored in a retrieval system, translated into any human or computer
-// language by any means, or disclosed to third parties without the explicit written
-// agreement of Google Inc. Without such an agreement, no rights or licenses, express
-// or implied, including but not limited to any patent rights, are granted to you.
+//    http://www.apache.org/licenses/LICENSE-2.0
 //
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include "PixelProgram.hpp"
 #include "Primitive.hpp"
@@ -25,7 +28,7 @@ namespace sw
        {
                if(shader->getVersion() >= 0x0300)
                {
-                       if(shader->vPosDeclared)
+                       if(shader->isVPosDeclared())
                        {
                                if(!halfIntegerCoordinates)
                                {
@@ -45,7 +48,7 @@ namespace sw
                                }
                        }
 
-                       if(shader->vFaceDeclared)
+                       if(shader->isVFaceDeclared())
                        {
                                Float4 area = *Pointer<Float>(primitive + OFFSET(Primitive, area));
                                Float4 face = booleanFaceRegister ? Float4(As<Float4>(CmpNLT(area, Float4(0.0f)))) : area;
@@ -91,6 +94,8 @@ namespace sw
                        }
                }
 
+               bool broadcastColor0 = true;
+
                for(size_t i = 0; i < shader->getLength(); i++)
                {
                        const Shader::Instruction *instruction = shader->getInstruction(i);
@@ -230,8 +235,10 @@ namespace sw
                        case Shader::OPCODE_UINTBITSTOFLOAT: d = s0;                                   break;
                        case Shader::OPCODE_PACKSNORM2x16:   packSnorm2x16(d, s0);                     break;
                        case Shader::OPCODE_PACKUNORM2x16:   packUnorm2x16(d, s0);                     break;
+                       case Shader::OPCODE_PACKHALF2x16:    packHalf2x16(d, s0);                      break;
                        case Shader::OPCODE_UNPACKSNORM2x16: unpackSnorm2x16(d, s0);                   break;
                        case Shader::OPCODE_UNPACKUNORM2x16: unpackUnorm2x16(d, s0);                   break;
+                       case Shader::OPCODE_UNPACKHALF2x16:  unpackHalf2x16(d, s0);                    break;
                        case Shader::OPCODE_POWX:       powx(d, s0, s1, pp);                           break;
                        case Shader::OPCODE_POW:        pow(d, s0, s1, pp);                            break;
                        case Shader::OPCODE_SGN:        sgn(d, s0);                                    break;
@@ -274,14 +281,14 @@ namespace sw
                        case Shader::OPCODE_M3X3:       M3X3(d, s0, src1);                             break;
                        case Shader::OPCODE_M3X2:       M3X2(d, s0, src1);                             break;
                        case Shader::OPCODE_TEX:        TEXLD(d, s0, src1, project, bias);             break;
-                       case Shader::OPCODE_TEXLDD:     TEXLDD(d, s0, src1, s2, s3, project);          break;
-                       case Shader::OPCODE_TEXLDL:     TEXLDL(d, s0, src1, project);                  break;
+                       case Shader::OPCODE_TEXLDD:     TEXLDD(d, s0, src1, s2, s3);                   break;
+                       case Shader::OPCODE_TEXLDL:     TEXLDL(d, s0, src1);                           break;
                        case Shader::OPCODE_TEXSIZE:    TEXSIZE(d, s0.x, src1);                        break;
                        case Shader::OPCODE_TEXKILL:    TEXKILL(cMask, d, dst.mask);                   break;
-                       case Shader::OPCODE_TEXOFFSET:  TEXOFFSET(d, s0, src1, s2, s3, project, bias); break;
-                       case Shader::OPCODE_TEXLDLOFFSET: TEXLDL(d, s0, src1, s2, project, bias);      break;
-                       case Shader::OPCODE_TEXELFETCH: TEXELFETCH(d, s0, src1, s2);                   break;
-                       case Shader::OPCODE_TEXELFETCHOFFSET: TEXELFETCH(d, s0, src1, s2, s3);         break;
+                       case Shader::OPCODE_TEXOFFSET:  TEXOFFSET(d, s0, src1, s2, bias);              break;
+                       case Shader::OPCODE_TEXLDLOFFSET: TEXLDL(d, s0, src1, s2, bias);               break;
+                       case Shader::OPCODE_TEXELFETCH: TEXELFETCH(d, s0, src1);                       break;
+                       case Shader::OPCODE_TEXELFETCHOFFSET: TEXELFETCH(d, s0, src1, s2);             break;
                        case Shader::OPCODE_TEXGRAD:    TEXGRAD(d, s0, src1, s2, s3);                  break;
                        case Shader::OPCODE_TEXGRADOFFSET: TEXGRAD(d, s0, src1, s2, s3, s4);           break;
                        case Shader::OPCODE_DISCARD:    DISCARD(cMask, instruction);                   break;
@@ -300,21 +307,23 @@ namespace sw
                        case Shader::OPCODE_ENDLOOP:    ENDLOOP();                                     break;
                        case Shader::OPCODE_ENDREP:     ENDREP();                                      break;
                        case Shader::OPCODE_ENDWHILE:   ENDWHILE();                                    break;
+                       case Shader::OPCODE_ENDSWITCH:  ENDSWITCH();                                   break;
                        case Shader::OPCODE_IF:         IF(src0);                                      break;
                        case Shader::OPCODE_IFC:        IFC(s0, s1, control);                          break;
                        case Shader::OPCODE_LABEL:      LABEL(dst.index);                              break;
                        case Shader::OPCODE_LOOP:       LOOP(src1);                                    break;
                        case Shader::OPCODE_REP:        REP(src0);                                     break;
                        case Shader::OPCODE_WHILE:      WHILE(src0);                                   break;
+                       case Shader::OPCODE_SWITCH:     SWITCH();                                      break;
                        case Shader::OPCODE_RET:        RET();                                         break;
                        case Shader::OPCODE_LEAVE:      LEAVE();                                       break;
                        case Shader::OPCODE_CMP:        cmp(d, s0, s1, control);                       break;
                        case Shader::OPCODE_ALL:        all(d.x, s0);                                  break;
                        case Shader::OPCODE_ANY:        any(d.x, s0);                                  break;
-                       case Shader::OPCODE_NOT:        not(d, s0);                                    break;
-                       case Shader::OPCODE_OR:         or(d, s0, s1);                                 break;
-                       case Shader::OPCODE_XOR:        xor(d, s0, s1);                                break;
-                       case Shader::OPCODE_AND:        and(d, s0, s1);                                break;
+                       case Shader::OPCODE_NOT:        bitwise_not(d, s0);                            break;
+                       case Shader::OPCODE_OR:         bitwise_or(d, s0, s1);                         break;
+                       case Shader::OPCODE_XOR:        bitwise_xor(d, s0, s1);                        break;
+                       case Shader::OPCODE_AND:        bitwise_and(d, s0, s1);                        break;
                        case Shader::OPCODE_EQ:         equal(d, s0, s1);                              break;
                        case Shader::OPCODE_NE:         notEqual(d, s0, s1);                           break;
                        case Shader::OPCODE_END:                                                       break;
@@ -473,6 +482,8 @@ namespace sw
                                case Shader::PARAMETER_COLOROUT:
                                        if(dst.rel.type == Shader::PARAMETER_VOID)
                                        {
+                                               broadcastColor0 = (dst.index == 0) && broadcastColor0;
+
                                                if(dst.x) { oC[dst.index].x = d.x; }
                                                if(dst.y) { oC[dst.index].y = d.y; }
                                                if(dst.z) { oC[dst.index].z = d.z; }
@@ -480,6 +491,7 @@ namespace sw
                                        }
                                        else
                                        {
+                                               broadcastColor0 = false;
                                                Int a = relativeAddress(dst) + dst.index;
 
                                                if(dst.x) { oC[a].x = d.x; }
@@ -508,9 +520,19 @@ namespace sw
                        Nucleus::setInsertBlock(returnBlock);
                }
 
-               for(int i = 0; i < RENDERTARGETS; i++)
+               if(broadcastColor0)
+               {
+                       for(int i = 0; i < RENDERTARGETS; i++)
+                       {
+                               c[i] = oC[0];
+                       }
+               }
+               else
                {
-                       c[i] = oC[i];
+                       for(int i = 0; i < RENDERTARGETS; i++)
+                       {
+                               c[i] = oC[i];
+                       }
                }
        }
 
@@ -561,7 +583,7 @@ namespace sw
                                continue;
                        }
 
-                       if(!postBlendSRGB && state.writeSRGB)
+                       if(!postBlendSRGB && state.writeSRGB && !isSRGB(index))
                        {
                                c[index].x = linearToSRGB(c[index].x);
                                c[index].y = linearToSRGB(c[index].y);
@@ -580,6 +602,10 @@ namespace sw
                        case FORMAT_X8B8G8R8:
                        case FORMAT_A8R8G8B8:
                        case FORMAT_A8B8G8R8:
+                       case FORMAT_SRGB8_X8:
+                       case FORMAT_SRGB8_A8:
+                       case FORMAT_G8R8:
+                       case FORMAT_R8:
                        case FORMAT_A8:
                        case FORMAT_G16R16:
                        case FORMAT_A16B16G16R16:
@@ -613,6 +639,7 @@ namespace sw
                                break;
                        case FORMAT_R32F:
                        case FORMAT_G32R32F:
+                       case FORMAT_X32B32G32R32F:
                        case FORMAT_A32B32G32R32F:
                        case FORMAT_R32I:
                        case FORMAT_G32R32I:
@@ -620,6 +647,18 @@ namespace sw
                        case FORMAT_R32UI:
                        case FORMAT_G32R32UI:
                        case FORMAT_A32B32G32R32UI:
+                       case FORMAT_R16I:
+                       case FORMAT_G16R16I:
+                       case FORMAT_A16B16G16R16I:
+                       case FORMAT_R16UI:
+                       case FORMAT_G16R16UI:
+                       case FORMAT_A16B16G16R16UI:
+                       case FORMAT_R8I:
+                       case FORMAT_G8R8I:
+                       case FORMAT_A8B8G8R8I:
+                       case FORMAT_R8UI:
+                       case FORMAT_G8R8UI:
+                       case FORMAT_A8B8G8R8UI:
                                for(unsigned int q = 0; q < state.multiSample; q++)
                                {
                                        Pointer<Byte> buffer = cBuffer[index] + q * *Pointer<Int>(data + OFFSET(DrawData, colorSliceB[index]));
@@ -638,13 +677,13 @@ namespace sw
                }
        }
 
-       void PixelProgram::sampleTexture(Vector4f &c, const Src &sampler, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Vector4f &dsx, Vector4f &dsy, bool project, SamplerMethod method)
+       void PixelProgram::sampleTexture(Vector4f &c, const Src &sampler, Vector4f &uvwq, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function)
        {
                Vector4f tmp;
 
                if(sampler.type == Shader::PARAMETER_SAMPLER && sampler.rel.type == Shader::PARAMETER_VOID)
                {
-                       sampleTexture(tmp, sampler.index, u, v, w, q, dsx, dsy, project, method);
+                       sampleTexture(tmp, sampler.index, uvwq, dsx, dsy, offset, function);
                }
                else
                {
@@ -656,7 +695,7 @@ namespace sw
                                {
                                        If(index == i)
                                        {
-                                               sampleTexture(tmp, i, u, v, w, q, dsx, dsy, project, method);
+                                               sampleTexture(tmp, i, uvwq, dsx, dsy, offset, function);
                                                // FIXME: When the sampler states are the same, we could use one sampler and just index the texture
                                        }
                                }
@@ -669,28 +708,14 @@ namespace sw
                c.w = tmp[(sampler.swizzle >> 6) & 0x3];
        }
 
-       void PixelProgram::sampleTexture(Vector4f &c, int stage, Float4 &u, Float4 &v, Float4 &w, Float4 &q, Vector4f &dsx, Vector4f &dsy, bool project, SamplerMethod method)
+       void PixelProgram::sampleTexture(Vector4f &c, int samplerIndex, Vector4f &uvwq, Vector4f &dsx, Vector4f &dsy, Vector4f &offset, SamplerFunction function)
        {
                #if PERF_PROFILE
                        Long texTime = Ticks();
                #endif
 
-               Pointer<Byte> texture = data + OFFSET(DrawData, mipmap) + stage * sizeof(Texture);
-
-               if(!project)
-               {
-                       sampler[stage]->sampleTexture(texture, c, u, v, w, q, dsx, dsy, method);
-               }
-               else
-               {
-                       Float4 rq = reciprocal(q);
-
-                       Float4 u_q = u * rq;
-                       Float4 v_q = v * rq;
-                       Float4 w_q = w * rq;
-
-                       sampler[stage]->sampleTexture(texture, c, u_q, v_q, w_q, q, dsx, dsy, method);
-               }
+               Pointer<Byte> texture = data + OFFSET(DrawData, mipmap) + samplerIndex * sizeof(Texture);
+               sampler[samplerIndex]->sampleTexture(texture, c, uvwq.x, uvwq.y, uvwq.z, uvwq.w, dsx, dsy, offset, function);
 
                #if PERF_PROFILE
                        cycles[PERF_TEX] += Ticks() - texTime;
@@ -715,6 +740,10 @@ namespace sw
                        case FORMAT_A8B8G8R8:
                        case FORMAT_X8R8G8B8:
                        case FORMAT_X8B8G8R8:
+                       case FORMAT_SRGB8_X8:
+                       case FORMAT_SRGB8_A8:
+                       case FORMAT_G8R8:
+                       case FORMAT_R8:
                        case FORMAT_A8:
                        case FORMAT_G16R16:
                        case FORMAT_A16B16G16R16:
@@ -725,6 +754,7 @@ namespace sw
                                break;
                        case FORMAT_R32F:
                        case FORMAT_G32R32F:
+                       case FORMAT_X32B32G32R32F:
                        case FORMAT_A32B32G32R32F:
                        case FORMAT_R32I:
                        case FORMAT_G32R32I:
@@ -732,6 +762,18 @@ namespace sw
                        case FORMAT_R32UI:
                        case FORMAT_G32R32UI:
                        case FORMAT_A32B32G32R32UI:
+                       case FORMAT_R16I:
+                       case FORMAT_G16R16I:
+                       case FORMAT_A16B16G16R16I:
+                       case FORMAT_R16UI:
+                       case FORMAT_G16R16UI:
+                       case FORMAT_A16B16G16R16UI:
+                       case FORMAT_R8I:
+                       case FORMAT_G8R8I:
+                       case FORMAT_A8B8G8R8I:
+                       case FORMAT_R8UI:
+                       case FORMAT_G8R8UI:
+                       case FORMAT_A8B8G8R8UI:
                                break;
                        default:
                                ASSERT(false);
@@ -804,8 +846,8 @@ namespace sw
                        reg = v[2 + i];
                        break;
                case Shader::PARAMETER_MISCTYPE:
-                       if(src.index == 0) reg = vPos;
-                       if(src.index == 1) reg = vFace;
+                       if(src.index == Shader::VPosIndex) reg = vPos;
+                       if(src.index == Shader::VFaceIndex) reg = vFace;
                        break;
                case Shader::PARAMETER_SAMPLER:
                        if(src.rel.type == Shader::PARAMETER_VOID)
@@ -1067,59 +1109,66 @@ namespace sw
 
        void PixelProgram::TEXLD(Vector4f &dst, Vector4f &src0, const Src &src1, bool project, bool bias)
        {
-               sampleTexture(dst, src1, src0.x, src0.y, src0.z, src0.w, src0, src0, project, bias ? Bias : Implicit);
+               if(project)
+               {
+                       Vector4f proj;
+                       Float4 rw = reciprocal(src0.w);
+                       proj.x = src0.x * rw;
+                       proj.y = src0.y * rw;
+                       proj.z = src0.z * rw;
+
+                       sampleTexture(dst, src1, proj, src0, src0, src0, Implicit);
+               }
+               else
+               {
+                       sampleTexture(dst, src1, src0, src0, src0, src0, bias ? Bias : Implicit);
+               }
        }
 
-       void PixelProgram::TEXOFFSET(Vector4f &dst, Vector4f &src0, const Src& src1, Vector4f &src2, Vector4f &src3, bool project, bool bias)
+       void PixelProgram::TEXOFFSET(Vector4f &dst, Vector4f &src0, const Src &src1, Vector4f &src2, bool bias)
        {
-               UNIMPLEMENTED();
+               sampleTexture(dst, src1, src0, src0, src0, src2, {bias ? Bias : Implicit, Offset});
        }
 
-       void PixelProgram::TEXLDL(Vector4f &dst, Vector4f &src0, const Src &src1, Vector4f &offset, bool project, bool bias)
+       void PixelProgram::TEXLDL(Vector4f &dst, Vector4f &src0, const Src &src1, Vector4f &offset, bool bias)
        {
-               UNIMPLEMENTED();
+               sampleTexture(dst, src1, src0, src0, src0, offset, {Lod, Offset});
        }
 
-       void PixelProgram::TEXELFETCH(Vector4f &dst, Vector4f &src0, const Src& src1, Vector4f &src2)
+       void PixelProgram::TEXELFETCH(Vector4f &dst, Vector4f &src0, const Src& src1)
        {
-               UNIMPLEMENTED();
+               sampleTexture(dst, src1, src0, src0, src0, src0, Fetch);
        }
 
-       void PixelProgram::TEXELFETCH(Vector4f &dst, Vector4f &src0, const Src& src1, Vector4f &src2, Vector4f &offset)
+       void PixelProgram::TEXELFETCH(Vector4f &dst, Vector4f &src0, const Src& src1, Vector4f &offset)
        {
-               UNIMPLEMENTED();
+               sampleTexture(dst, src1, src0, src0, src0, offset, {Fetch, Offset});
        }
 
        void PixelProgram::TEXGRAD(Vector4f &dst, Vector4f &src0, const Src& src1, Vector4f &src2, Vector4f &src3)
        {
-               UNIMPLEMENTED();
+               sampleTexture(dst, src1, src0, src2, src3, src0, Grad);
        }
 
        void PixelProgram::TEXGRAD(Vector4f &dst, Vector4f &src0, const Src& src1, Vector4f &src2, Vector4f &src3, Vector4f &offset)
        {
-               UNIMPLEMENTED();
+               sampleTexture(dst, src1, src0, src2, src3, offset, {Grad, Offset});
        }
 
-       void PixelProgram::TEXLDD(Vector4f &dst, Vector4f &src0, const Src &src1, Vector4f &src2, Vector4f &src3, bool project)
+       void PixelProgram::TEXLDD(Vector4f &dst, Vector4f &src0, const Src &src1, Vector4f &src2, Vector4f &src3)
        {
-               sampleTexture(dst, src1, src0.x, src0.y, src0.z, src0.w, src2, src3, project, Grad);
+               sampleTexture(dst, src1, src0, src2, src3, src0, Grad);
        }
 
-       void PixelProgram::TEXLDL(Vector4f &dst, Vector4f &src0, const Src &src1, bool project)
+       void PixelProgram::TEXLDL(Vector4f &dst, Vector4f &src0, const Src &src1)
        {
-               sampleTexture(dst, src1, src0.x, src0.y, src0.z, src0.w, src0, src0, project, Lod);
+               sampleTexture(dst, src1, src0, src0, src0, src0, Lod);
        }
 
        void PixelProgram::TEXSIZE(Vector4f &dst, Float4 &lod, const Src &src1)
        {
-               Pointer<Byte> textureMipmap = data + OFFSET(DrawData, mipmap) + src1.index * sizeof(Texture) + OFFSET(Texture, mipmap);
-               for(int i = 0; i < 4; ++i)
-               {
-                       Pointer<Byte> mipmap = textureMipmap + (As<Int>(Extract(lod, i)) + Int(1)) * sizeof(Mipmap);
-                       dst.x = Insert(dst.x, As<Float>(Int(*Pointer<Short>(mipmap + OFFSET(Mipmap, width)))), i);
-                       dst.y = Insert(dst.y, As<Float>(Int(*Pointer<Short>(mipmap + OFFSET(Mipmap, height)))), i);
-                       dst.z = Insert(dst.z, As<Float>(Int(*Pointer<Short>(mipmap + OFFSET(Mipmap, depth)))), i);
-               }
+               Pointer<Byte> texture = data + OFFSET(DrawData, mipmap) + src1.index * sizeof(Texture);
+               sampler[src1.index]->textureSize(texture, dst, lod);
        }
 
        void PixelProgram::TEXKILL(Int cMask[4], Vector4f &src, unsigned char mask)
@@ -1189,8 +1238,8 @@ namespace sw
 
        void PixelProgram::BREAK()
        {
-               llvm::BasicBlock *deadBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *endBlock = loopRepEndBlock[loopRepDepth - 1];
+               BasicBlock *deadBlock = Nucleus::createBasicBlock();
+               BasicBlock *endBlock = loopRepEndBlock[loopRepDepth - 1];
 
                if(breakDepth == 0)
                {
@@ -1245,8 +1294,8 @@ namespace sw
        {
                condition &= enableStack[enableIndex];
 
-               llvm::BasicBlock *continueBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *endBlock = loopRepEndBlock[loopRepDepth - 1];
+               BasicBlock *continueBlock = Nucleus::createBasicBlock();
+               BasicBlock *endBlock = loopRepEndBlock[loopRepDepth - 1];
 
                enableBreak = enableBreak & ~condition;
                Bool allBreak = SignMask(enableBreak) == 0x0;
@@ -1365,8 +1414,8 @@ namespace sw
        {
                ifDepth--;
 
-               llvm::BasicBlock *falseBlock = ifFalseBlock[ifDepth];
-               llvm::BasicBlock *endBlock = Nucleus::createBasicBlock();
+               BasicBlock *falseBlock = ifFalseBlock[ifDepth];
+               BasicBlock *endBlock = Nucleus::createBasicBlock();
 
                if(isConditionalIf[ifDepth])
                {
@@ -1392,7 +1441,7 @@ namespace sw
        {
                ifDepth--;
 
-               llvm::BasicBlock *endBlock = ifFalseBlock[ifDepth];
+               BasicBlock *endBlock = ifFalseBlock[ifDepth];
 
                Nucleus::createBr(endBlock);
                Nucleus::setInsertBlock(endBlock);
@@ -1410,8 +1459,8 @@ namespace sw
 
                aL[loopDepth] = aL[loopDepth] + increment[loopDepth];   // FIXME: +=
 
-               llvm::BasicBlock *testBlock = loopRepTestBlock[loopRepDepth];
-               llvm::BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
+               BasicBlock *testBlock = loopRepTestBlock[loopRepDepth];
+               BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
 
                Nucleus::createBr(testBlock);
                Nucleus::setInsertBlock(endBlock);
@@ -1424,8 +1473,8 @@ namespace sw
        {
                loopRepDepth--;
 
-               llvm::BasicBlock *testBlock = loopRepTestBlock[loopRepDepth];
-               llvm::BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
+               BasicBlock *testBlock = loopRepTestBlock[loopRepDepth];
+               BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
 
                Nucleus::createBr(testBlock);
                Nucleus::setInsertBlock(endBlock);
@@ -1438,8 +1487,8 @@ namespace sw
        {
                loopRepDepth--;
 
-               llvm::BasicBlock *testBlock = loopRepTestBlock[loopRepDepth];
-               llvm::BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
+               BasicBlock *testBlock = loopRepTestBlock[loopRepDepth];
+               BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
 
                Nucleus::createBr(testBlock);
                Nucleus::setInsertBlock(endBlock);
@@ -1449,6 +1498,19 @@ namespace sw
                whileTest = false;
        }
 
+       void PixelProgram::ENDSWITCH()
+       {
+               loopRepDepth--;
+
+               BasicBlock *endBlock = loopRepEndBlock[loopRepDepth];
+
+               Nucleus::createBr(loopRepEndBlock[loopRepDepth]);
+               Nucleus::setInsertBlock(endBlock);
+
+               enableIndex--;
+               enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
+       }
+
        void PixelProgram::IF(const Src &src)
        {
                if(src.type == Shader::PARAMETER_CONSTBOOL)
@@ -1477,8 +1539,8 @@ namespace sw
                        condition = !condition;
                }
 
-               llvm::BasicBlock *trueBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *falseBlock = Nucleus::createBasicBlock();
+               BasicBlock *trueBlock = Nucleus::createBasicBlock();
+               BasicBlock *falseBlock = Nucleus::createBasicBlock();
 
                branch(condition, trueBlock, falseBlock);
 
@@ -1526,8 +1588,8 @@ namespace sw
                enableIndex++;
                enableStack[enableIndex] = condition;
 
-               llvm::BasicBlock *trueBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *falseBlock = Nucleus::createBasicBlock();
+               BasicBlock *trueBlock = Nucleus::createBasicBlock();
+               BasicBlock *falseBlock = Nucleus::createBasicBlock();
 
                Bool notAllFalse = SignMask(condition) != 0;
 
@@ -1564,9 +1626,9 @@ namespace sw
                //              increment[loopDepth] = 1;
                //      }
 
-               llvm::BasicBlock *loopBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *testBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *endBlock = Nucleus::createBasicBlock();
+               BasicBlock *loopBlock = Nucleus::createBasicBlock();
+               BasicBlock *testBlock = Nucleus::createBasicBlock();
+               BasicBlock *endBlock = Nucleus::createBasicBlock();
 
                loopRepTestBlock[loopRepDepth] = testBlock;
                loopRepEndBlock[loopRepDepth] = endBlock;
@@ -1591,9 +1653,9 @@ namespace sw
                iteration[loopDepth] = *Pointer<Int>(data + OFFSET(DrawData, ps.i[integerRegister.index][0]));
                aL[loopDepth] = aL[loopDepth - 1];
 
-               llvm::BasicBlock *loopBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *testBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *endBlock = Nucleus::createBasicBlock();
+               BasicBlock *loopBlock = Nucleus::createBasicBlock();
+               BasicBlock *testBlock = Nucleus::createBasicBlock();
+               BasicBlock *endBlock = Nucleus::createBasicBlock();
 
                loopRepTestBlock[loopRepDepth] = testBlock;
                loopRepEndBlock[loopRepDepth] = endBlock;
@@ -1615,9 +1677,9 @@ namespace sw
        {
                enableIndex++;
 
-               llvm::BasicBlock *loopBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *testBlock = Nucleus::createBasicBlock();
-               llvm::BasicBlock *endBlock = Nucleus::createBasicBlock();
+               BasicBlock *loopBlock = Nucleus::createBasicBlock();
+               BasicBlock *testBlock = Nucleus::createBasicBlock();
+               BasicBlock *endBlock = Nucleus::createBasicBlock();
 
                loopRepTestBlock[loopRepDepth] = testBlock;
                loopRepEndBlock[loopRepDepth] = endBlock;
@@ -1633,6 +1695,7 @@ namespace sw
                const Vector4f &src = fetchRegister(temporaryRegister);
                Int4 condition = As<Int4>(src.x);
                condition &= enableStack[enableIndex - 1];
+               if(shader->containsLeaveInstruction()) condition &= enableLeave;
                enableStack[enableIndex] = condition;
 
                Bool notAllFalse = SignMask(condition) != 0;
@@ -1647,6 +1710,20 @@ namespace sw
                breakDepth = 0;
        }
 
+       void PixelProgram::SWITCH()
+       {
+               enableIndex++;
+               enableStack[enableIndex] = Int4(0xFFFFFFFF);
+
+               BasicBlock *endBlock = Nucleus::createBasicBlock();
+
+               loopRepTestBlock[loopRepDepth] = nullptr;
+               loopRepEndBlock[loopRepDepth] = endBlock;
+
+               loopRepDepth++;
+               breakDepth = 0;
+       }
+
        void PixelProgram::RET()
        {
                if(currentLabel == -1)
@@ -1656,19 +1733,19 @@ namespace sw
                }
                else
                {
-                       llvm::BasicBlock *unreachableBlock = Nucleus::createBasicBlock();
+                       BasicBlock *unreachableBlock = Nucleus::createBasicBlock();
 
                        if(callRetBlock[currentLabel].size() > 1)   // Pop the return destination from the call stack
                        {
                                // FIXME: Encapsulate
                                UInt index = callStack[--stackIndex];
 
-                               llvm::Value *value = index.loadValue();
-                               llvm::Value *switchInst = Nucleus::createSwitch(value, unreachableBlock, (int)callRetBlock[currentLabel].size());
+                               Value *value = index.loadValue();
+                               SwitchCases *switchCases = Nucleus::createSwitch(value, unreachableBlock, (int)callRetBlock[currentLabel].size());
 
                                for(unsigned int i = 0; i < callRetBlock[currentLabel].size(); i++)
                                {
-                                       Nucleus::addSwitchCase(switchInst, i, callRetBlock[currentLabel][i]);
+                                       Nucleus::addSwitchCase(switchCases, i, callRetBlock[currentLabel][i]);
                                }
                        }
                        else if(callRetBlock[currentLabel].size() == 1)   // Jump directly to the unique return destination