Revert "Vulkan: Use specialization constant for halfRenderAreaWidth"

include/GLSLANG/ShaderLang.h

@@ -26,7 +26,7 @@
 
 // Version number for shader translation API.
 // It is incremented every time the API changes.
-#define ANGLE_SH_VERSION 246
+#define ANGLE_SH_VERSION 245
 
 enum ShShaderSpec
 {
@@ -813,10 +813,8 @@ enum class SpecializationConstantId : uint32_t
 {
     LineRasterEmulation = 0,
     SurfaceRotation     = 1,
-    DrawableWidth       = 2,
-    DrawableHeight      = 3,
 
-    InvalidEnum = 4,
+    InvalidEnum = 2,
     EnumCount   = InvalidEnum,
 };
 
@@ -840,9 +838,8 @@ enum class SpecConstUsage : uint32_t
     LineRasterEmulation = 0,
     YFlip               = 1,
     Rotation            = 2,
-    DrawableSize        = 3,
 
-    InvalidEnum = 4,
+    InvalidEnum = 3,
     EnumCount   = InvalidEnum,
 };
 

src/compiler/translator/TranslatorVulkan.cpp

@@ -467,13 +467,7 @@ ANGLE_NO_DISCARD bool InsertFragCoordCorrection(TCompiler *compiler,
     {
         flipXY = driverUniforms->getFlipXYRef();
     }
-
-    TIntermBinary *pivot = rotationSpecConst->getHalfRenderArea();
-    if (!pivot)
-    {
-        pivot = driverUniforms->getHalfRenderAreaRef();
-    }
-
+    TIntermBinary *pivot       = driverUniforms->getHalfRenderAreaRef();
     TIntermTyped *fragRotation = nullptr;
     if (compileOptions & SH_ADD_PRE_ROTATION)
     {

src/compiler/translator/tree_util/FlipRotateSpecConst.cpp

@@ -22,8 +22,6 @@ namespace
 {
 constexpr ImmutableString kSurfaceRotationSpecConstVarName =
     ImmutableString("ANGLESurfaceRotation");
-constexpr ImmutableString kDrawableWidthSpecConstVarName  = ImmutableString("ANGLEDrawableWidth");
-constexpr ImmutableString kDrawableHeightSpecConstVarName = ImmutableString("ANGLEDrawableHeight");
 
 // When an Android surface is rotated differently than the device's native orientation, ANGLE must
 // rotate gl_Position in the vertex shader and gl_FragCoord in the fragment shader.  The following
@@ -54,19 +52,6 @@ constexpr Mat2x2EnumMap kFragRotationMatrices = {
      {vk::SurfaceRotation::FlippedRotated180Degrees, {{1.0f, 0.0f, 0.0f, 1.0f}}},
      {vk::SurfaceRotation::FlippedRotated270Degrees, {{0.0f, 1.0f, 1.0f, 0.0f}}}}};
 
-// TODO: https://issuetracker.google.com/174066134. This is to make sure the specialization constant
-// code path behaves exactly the same as driver uniform code path. Not sure why this has to be
-// different from kFragRotationMatrices.
-constexpr Mat2x2EnumMap kHalfRenderAreaRotationMatrices = {
-    {{vk::SurfaceRotation::Identity, {{1.0f, 0.0f, 0.0f, 1.0f}}},
-     {vk::SurfaceRotation::Rotated90Degrees, {{0.0f, 1.0f, 1.0f, 0.0f}}},
-     {vk::SurfaceRotation::Rotated180Degrees, {{1.0f, 0.0f, 0.0f, 1.0f}}},
-     {vk::SurfaceRotation::Rotated270Degrees, {{1.0f, 0.0f, 0.0f, 1.0f}}},
-     {vk::SurfaceRotation::FlippedIdentity, {{1.0f, 0.0f, 0.0f, 1.0f}}},
-     {vk::SurfaceRotation::FlippedRotated90Degrees, {{0.0f, 1.0f, 1.0f, 0.0f}}},
-     {vk::SurfaceRotation::FlippedRotated180Degrees, {{1.0f, 0.0f, 0.0f, 1.0f}}},
-     {vk::SurfaceRotation::FlippedRotated270Degrees, {{1.0f, 0.0f, 0.0f, 1.0f}}}}};
-
 // Returns mat2(m0, m1, m2, m3)
 TIntermAggregate *CreateMat2x2(const Mat2x2EnumMap &matrix, vk::SurfaceRotation rotation)
 {
@@ -235,7 +220,7 @@ TIntermTyped *CreateFloatArrayWithRotationIndex(const Vec2EnumMap &valuesEnumMap
 }
 }  // anonymous namespace
 
-FlipRotateSpecConst::FlipRotateSpecConst() : mSymbolTable(nullptr), mSpecConstSymbol(nullptr) {}
+FlipRotateSpecConst::FlipRotateSpecConst() : mSpecConstSymbol(nullptr) {}
 
 FlipRotateSpecConst::~FlipRotateSpecConst()
 {
@@ -251,29 +236,17 @@ void FlipRotateSpecConst::generateSymbol(TSymbolTable *symbolTable)
         new TVariable(symbolTable, kSurfaceRotationSpecConstVarName,
                       StaticType::GetBasic<EbtUInt>(), SymbolType::AngleInternal);
     mSpecConstSymbol = new TIntermSymbol(specConstVar);
-
-    mSymbolTable = symbolTable;
 }
 
 void FlipRotateSpecConst::outputLayoutString(TInfoSinkBase &sink) const
 {
     // Only emit specialized const layout string if it has been referenced.
-    if (mUsageBits.test(vk::SpecConstUsage::YFlip) || mUsageBits.test(vk::SpecConstUsage::Rotation))
+    if (mUsageBits.any())
     {
         sink << "layout(constant_id="
              << static_cast<uint32_t>(vk::SpecializationConstantId::SurfaceRotation)
              << ") const uint " << kSurfaceRotationSpecConstVarName << " = 0;\n\n";
     }
-
-    if (mUsageBits.test(vk::SpecConstUsage::DrawableSize))
-    {
-        sink << "layout(constant_id="
-             << static_cast<uint32_t>(vk::SpecializationConstantId::DrawableWidth)
-             << ") const uint " << kDrawableWidthSpecConstVarName << " = 0;\n\n";
-        sink << "layout(constant_id="
-             << static_cast<uint32_t>(vk::SpecializationConstantId::DrawableHeight)
-             << ") const uint " << kDrawableHeightSpecConstVarName << " = 0;\n\n";
-    }
 }
 
 TIntermTyped *FlipRotateSpecConst::getMultiplierXForDFdx()
@@ -340,16 +313,6 @@ TIntermTyped *FlipRotateSpecConst::getFragRotationMatrix()
     return GenerateMat2x2ArrayWithIndex(kFragRotationMatrices, mSpecConstSymbol);
 }
 
-TIntermTyped *FlipRotateSpecConst::getHalfRenderAreaRotationMatrix()
-{
-    if (!mSpecConstSymbol)
-    {
-        return nullptr;
-    }
-    mUsageBits.set(vk::SpecConstUsage::Rotation);
-    return GenerateMat2x2ArrayWithIndex(kHalfRenderAreaRotationMatrices, mSpecConstSymbol);
-}
-
 TIntermTyped *FlipRotateSpecConst::getFlipXY()
 {
     if (!mSpecConstSymbol)
@@ -420,49 +383,4 @@ TIntermTyped *FlipRotateSpecConst::getFragRotationMultiplyFlipXY()
     return CreateVec2ArrayWithIndex(kFragRotationMultiplyFlipXY, 1.0, mSpecConstSymbol);
 }
 
-TIntermSymbol *FlipRotateSpecConst::getDrawableWidth()
-{
-    TVariable *widthSpecConstVar =
-        new TVariable(mSymbolTable, kDrawableWidthSpecConstVarName,
-                      StaticType::GetBasic<EbtFloat>(), SymbolType::AngleInternal);
-    TIntermSymbol *drawableWidth = new TIntermSymbol(widthSpecConstVar);
-    return drawableWidth;
-}
-
-TIntermSymbol *FlipRotateSpecConst::getDrawableHeight()
-{
-    TVariable *heightSpecConstVar =
-        new TVariable(mSymbolTable, kDrawableHeightSpecConstVarName,
-                      StaticType::GetBasic<EbtFloat>(), SymbolType::AngleInternal);
-    TIntermSymbol *drawableHeight = new TIntermSymbol(heightSpecConstVar);
-    return drawableHeight;
-}
-
-TIntermBinary *FlipRotateSpecConst::getHalfRenderArea()
-{
-    if (!mSymbolTable)
-    {
-        return nullptr;
-    }
-
-    // vec2 drawableSize(drawableWidth, drawableHeight)
-    auto vec2Type                    = new TType(EbtFloat, 2);
-    TIntermSequence *widthHeightArgs = new TIntermSequence();
-    widthHeightArgs->push_back(getDrawableWidth());
-    widthHeightArgs->push_back(getDrawableHeight());
-    TIntermAggregate *drawableSize =
-        TIntermAggregate::CreateConstructor(*vec2Type, widthHeightArgs);
-
-    // drawableSize * 0.5f
-    TIntermBinary *halfRenderArea =
-        new TIntermBinary(EOpVectorTimesScalar, drawableSize, CreateFloatNode(0.5));
-    mUsageBits.set(vk::SpecConstUsage::DrawableSize);
-
-    // drawableSize * 0.5f * halfRenderAreaRotationMatrix (See comment in
-    // kHalfRenderAreaRotationMatrices)
-    TIntermBinary *rotatedHalfRenderArea =
-        new TIntermBinary(EOpMatrixTimesVector, getHalfRenderAreaRotationMatrix(), halfRenderArea);
-
-    return rotatedHalfRenderArea;
-}
 }  // namespace sh

src/compiler/translator/tree_util/FlipRotateSpecConst.h

@@ -38,18 +38,12 @@ class FlipRotateSpecConst
     TIntermTyped *getFlipY();
     TIntermTyped *getNegFlipY();
     TIntermTyped *getFragRotationMultiplyFlipXY();
-    TIntermBinary *getHalfRenderArea();
-    TIntermTyped *getHalfRenderAreaRotationMatrix();
 
     void generateSymbol(TSymbolTable *symbolTable);
     void outputLayoutString(TInfoSinkBase &sink) const;
     SpecConstUsageBits getSpecConstUsageBits() const { return mUsageBits; }
 
   private:
-    TIntermSymbol *getDrawableWidth();
-    TIntermSymbol *getDrawableHeight();
-
-    TSymbolTable *mSymbolTable;
     TIntermSymbol *mSpecConstSymbol;
     // Bit is set if YFlip or Rotation has been used
     SpecConstUsageBits mUsageBits;

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -1089,8 +1089,8 @@ angle::Result ContextVk::handleDirtyGraphicsPipeline(const gl::Context *context,
     {
         const vk::GraphicsPipelineDesc *descPtr;
 
-        // The desc's specialization constant depends on program's
-        // specConstUsageBits. We need to update it if program has changed.
+        // The desc's surface rotation specialization constant depends on both program's
+        // specConstUsageBits and drawable. We need to update it if program has changed.
         SpecConstUsageBits usageBits = getCurrentProgramSpecConstUsageBits();
         updateGraphicsPipelineDescWithSpecConstUsageBits(usageBits);
 
@@ -3178,19 +3178,6 @@ void ContextVk::updateGraphicsPipelineDescWithSpecConstUsageBits(SpecConstUsageB
         // program object will be retrieved.
         mGraphicsPipelineDesc->updateSurfaceRotation(&mGraphicsPipelineTransition, rotationAndFlip);
     }
-
-    if (usageBits.test(sh::vk::SpecConstUsage::DrawableSize))
-    {
-        const gl::Box &dimensions = getState().getDrawFramebuffer()->getDimensions();
-        mGraphicsPipelineDesc->updateDrawableSize(&mGraphicsPipelineTransition, dimensions.width,
-                                                  dimensions.height);
-    }
-    else
-    {
-        // Always set specialization constant to 1x1 if it is not used so that pipeline program with
-        // only drawable size difference will be able to be reused.
-        mGraphicsPipelineDesc->updateDrawableSize(&mGraphicsPipelineTransition, 1, 1);
-    }
 }
 
 void ContextVk::updateSurfaceRotationDrawFramebuffer(const gl::State &glState)
@@ -3401,9 +3388,6 @@ void ContextVk::onDrawFramebufferRenderPassDescChange(FramebufferVk *framebuffer
     invalidateCurrentGraphicsPipeline();
     mGraphicsPipelineDesc->updateRenderPassDesc(&mGraphicsPipelineTransition,
                                                 framebufferVk->getRenderPassDesc());
-    const gl::Box &dimensions = framebufferVk->getState().getDimensions();
-    mGraphicsPipelineDesc->updateDrawableSize(&mGraphicsPipelineTransition, dimensions.width,
-                                              dimensions.height);
 }
 
 void ContextVk::invalidateCurrentTransformFeedbackBuffers()

src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp

@@ -679,17 +679,6 @@ angle::Result ProgramExecutableVk::getGraphicsPipeline(
 
     vk::ShaderProgramHelper *shaderProgram = programInfo.getShaderProgram();
     ASSERT(shaderProgram);
-
-    // Drawable size is part of specialization constant, but does not have its own dedicated
-    // programInfo entry. We pick the programInfo entry based on the mTransformOptions and then
-    // update drawable width/height specialization constant. It will go through desc matching and if
-    // spec constant does not match, it will recompile pipeline program.
-    const vk::PackedExtent &dimensions = desc.getDrawableSize();
-    shaderProgram->setSpecializationConstant(sh::vk::SpecializationConstantId::DrawableWidth,
-                                             dimensions.width);
-    shaderProgram->setSpecializationConstant(sh::vk::SpecializationConstantId::DrawableHeight,
-                                             dimensions.height);
-
     ANGLE_TRY(renderer->getPipelineCache(&pipelineCache));
     return shaderProgram->getGraphicsPipeline(
         contextVk, &contextVk->getRenderPassCache(), *pipelineCache, getPipelineLayout(), desc,

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -1202,16 +1202,6 @@ void InitializeSpecializationInfo(
                     offsetof(SpecializationConstants, surfaceRotation);
                 (*specializationEntriesOut)[id].size = sizeof(specConsts.surfaceRotation);
                 break;
-            case sh::vk::SpecializationConstantId::DrawableWidth:
-                (*specializationEntriesOut)[id].offset =
-                    offsetof(vk::SpecializationConstants, drawableWidth);
-                (*specializationEntriesOut)[id].size = sizeof(specConsts.drawableWidth);
-                break;
-            case sh::vk::SpecializationConstantId::DrawableHeight:
-                (*specializationEntriesOut)[id].offset =
-                    offsetof(vk::SpecializationConstants, drawableHeight);
-                (*specializationEntriesOut)[id].size = sizeof(specConsts.drawableHeight);
-                break;
             default:
                 UNREACHABLE();
                 break;
@@ -1620,7 +1610,7 @@ angle::Result GraphicsPipelineDesc::initializePipeline(
     const ShaderModule *vertexModule,
     const ShaderModule *fragmentModule,
     const ShaderModule *geometryModule,
-    const SpecializationConstants &specConsts,
+    const SpecializationConstants specConsts,
     Pipeline *pipelineOut) const
 {
     angle::FixedVector<VkPipelineShaderStageCreateInfo, 3> shaderStages;
@@ -2497,16 +2487,6 @@ void GraphicsPipelineDesc::updateScissor(GraphicsPipelineTransitionBits *transit
     transition->set(ANGLE_GET_TRANSITION_BIT(mScissor, height));
 }
 
-void GraphicsPipelineDesc::updateDrawableSize(GraphicsPipelineTransitionBits *transition,
-                                              uint32_t width,
-                                              uint32_t height)
-{
-    SetBitField(mDrawableSize.width, width);
-    SetBitField(mDrawableSize.height, height);
-    transition->set(ANGLE_GET_TRANSITION_BIT(mDrawableSize, width));
-    transition->set(ANGLE_GET_TRANSITION_BIT(mDrawableSize, height));
-}
-
 void GraphicsPipelineDesc::updateSubpass(GraphicsPipelineTransitionBits *transition,
                                          uint32_t subpass)
 {
@@ -3326,7 +3306,7 @@ angle::Result GraphicsPipelineCache::insertPipeline(
     const vk::ShaderModule *vertexModule,
     const vk::ShaderModule *fragmentModule,
     const vk::ShaderModule *geometryModule,
-    const vk::SpecializationConstants &specConsts,
+    const vk::SpecializationConstants specConsts,
     const vk::GraphicsPipelineDesc &desc,
     const vk::GraphicsPipelineDesc **descPtrOut,
     vk::PipelineHelper **pipelineOut)

src/libANGLE/renderer/vulkan/vk_cache_utils.h

@@ -534,12 +534,6 @@ struct PackedScissor final
     uint16_t width;
     uint16_t height;
 };
-
-struct PackedExtent final
-{
-    uint16_t width;
-    uint16_t height;
-};
 // This is invalid value for PackedScissor.x. It is used to indicate scissor is a dynamic state
 constexpr int32_t kDynamicScissorSentinel = std::numeric_limits<decltype(PackedScissor::x)>::max();
 
@@ -550,7 +544,7 @@ static_assert(kPackedInputAssemblyAndColorBlendStateSize == 56, "Size check fail
 constexpr size_t kGraphicsPipelineDescSumOfSizes =
     kVertexInputAttributesSize + kRenderPassDescSize + kPackedRasterizationAndMultisampleStateSize +
     kPackedDepthStencilStateSize + kPackedInputAssemblyAndColorBlendStateSize + sizeof(VkViewport) +
-    sizeof(PackedScissor) + sizeof(PackedExtent);
+    sizeof(PackedScissor);
 
 // Number of dirty bits in the dirty bit set.
 constexpr size_t kGraphicsPipelineDirtyBitBytes = 4;
@@ -598,7 +592,7 @@ class GraphicsPipelineDesc final
                                      const ShaderModule *vertexModule,
                                      const ShaderModule *fragmentModule,
                                      const ShaderModule *geometryModule,
-                                     const SpecializationConstants &specConsts,
+                                     const SpecializationConstants specConsts,
                                      Pipeline *pipelineOut) const;
 
     // Vertex input state. For ES 3.1 this should be separated into binding and attribute.
@@ -732,11 +726,6 @@ class GraphicsPipelineDesc final
             mDepthStencilStateInfo.depthCompareOpAndSurfaceRotation.surfaceRotation);
     }
 
-    void updateDrawableSize(GraphicsPipelineTransitionBits *transition,
-                            uint32_t width,
-                            uint32_t height);
-    const PackedExtent &getDrawableSize() const { return mDrawableSize; }
-
   private:
     void updateSubpass(GraphicsPipelineTransitionBits *transition, uint32_t subpass);
 
@@ -749,7 +738,6 @@ class GraphicsPipelineDesc final
     // The special value of .offset.x == INT_MIN for scissor implies dynamic scissor that needs to
     // be set through vkCmdSetScissor.
     PackedScissor mScissor;
-    PackedExtent mDrawableSize;
 };
 
 // Verify the packed pipeline description has no gaps in the packing.
@@ -1377,7 +1365,7 @@ class GraphicsPipelineCache final : angle::NonCopyable
                                            const vk::ShaderModule *vertexModule,
                                            const vk::ShaderModule *fragmentModule,
                                            const vk::ShaderModule *geometryModule,
-                                           const vk::SpecializationConstants &specConsts,
+                                           const vk::SpecializationConstants specConsts,
                                            const vk::GraphicsPipelineDesc &desc,
                                            const vk::GraphicsPipelineDesc **descPtrOut,
                                            vk::PipelineHelper **pipelineOut)
@@ -1406,7 +1394,7 @@ class GraphicsPipelineCache final : angle::NonCopyable
                                  const vk::ShaderModule *vertexModule,
                                  const vk::ShaderModule *fragmentModule,
                                  const vk::ShaderModule *geometryModule,
-                                 const vk::SpecializationConstants &specConsts,
+                                 const vk::SpecializationConstants specConsts,
                                  const vk::GraphicsPipelineDesc &desc,
                                  const vk::GraphicsPipelineDesc **descPtrOut,
                                  vk::PipelineHelper **pipelineOut);

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -6953,12 +6953,6 @@ void ShaderProgramHelper::setSpecializationConstant(sh::vk::SpecializationConsta
         case sh::vk::SpecializationConstantId::SurfaceRotation:
             mSpecializationConstants.surfaceRotation = value;
             break;
-        case sh::vk::SpecializationConstantId::DrawableWidth:
-            mSpecializationConstants.drawableWidth = value;
-            break;
-        case sh::vk::SpecializationConstantId::DrawableHeight:
-            mSpecializationConstants.drawableHeight = value;
-            break;
         default:
             UNREACHABLE();
             break;

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -690,8 +690,6 @@ struct SpecializationConstants final
 {
     VkBool32 lineRasterEmulation;
     uint32_t surfaceRotation;
-    uint32_t drawableWidth;
-    uint32_t drawableHeight;
 };
 ANGLE_DISABLE_STRUCT_PADDING_WARNINGS