Vulkan: Add culling rasterization states tests and invert front face

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -1332,15 +1332,16 @@ VkCullModeFlags GetCullMode(const gl::RasterizerState &rasterState)
 
 VkFrontFace GetFrontFace(GLenum frontFace)
 {
+    // Invert CW and CCW to have the same behavior as OpenGL.
     switch (frontFace)
     {
         case GL_CW:
-            return VK_FRONT_FACE_CLOCKWISE;
-        case GL_CCW:
             return VK_FRONT_FACE_COUNTER_CLOCKWISE;
+        case GL_CCW:
+            return VK_FRONT_FACE_CLOCKWISE;
         default:
             UNREACHABLE();
-            return VK_FRONT_FACE_COUNTER_CLOCKWISE;
+            return VK_FRONT_FACE_CLOCKWISE;
     }
 }
 

src/tests/gl_tests/SimpleOperationTest.cpp

@@ -64,6 +64,43 @@ void SimpleOperationTest::verifyBuffer(const std::vector<uint8_t> &data, GLenum
     EXPECT_EQ(data, readbackData);
 }
 
+// Validates if culling rasterization states work. Simply draws a quad with
+// cull face enabled and make sure we still render correctly.
+TEST_P(SimpleOperationTest, CullFaceEnabledState)
+{
+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
+    glUseProgram(program);
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    glEnable(GL_CULL_FACE);
+
+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
+
+    ASSERT_GL_NO_ERROR();
+
+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
+}
+
+// Validates if culling rasterization states work. Simply draws a quad with
+// cull face enabled with cullface front and make sure the face have not been rendered.
+TEST_P(SimpleOperationTest, CullFaceFrontEnabledState)
+{
+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
+    glUseProgram(program);
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    glEnable(GL_CULL_FACE);
+
+    // Should make the quad disappear since we draw it front facing.
+    glCullFace(GL_FRONT);
+
+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
+
+    ASSERT_GL_NO_ERROR();
+
+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
+}
+
 // Validates if blending render states work. Simply draws twice and verify the color have been
 // added in the final output.
 TEST_P(SimpleOperationTest, BlendingRenderState)

src/tests/gl_tests/StateChangeTest.cpp

@@ -1067,6 +1067,33 @@ TEST_P(SimpleStateChangeTest, RedefineFramebufferInUse)
     ASSERT_GL_NO_ERROR();
 }
 
+// Validates disabling cull face really disables it.
+TEST_P(SimpleStateChangeTest, EnableAndDisableCullFace)
+{
+    ANGLE_GL_PROGRAM(program, kSolidColorVertexShader, kSolidColorFragmentShader);
+    glUseProgram(program);
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    glEnable(GL_CULL_FACE);
+
+    glCullFace(GL_FRONT);
+
+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
+
+    ASSERT_GL_NO_ERROR();
+
+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
+
+    // Disable cull face and redraw, then make sure we have the quad drawn.
+    glDisable(GL_CULL_FACE);
+
+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
+
+    ASSERT_GL_NO_ERROR();
+
+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
+}
+
 TEST_P(SimpleStateChangeTest, ScissorTest)
 {
     // This test validates this order of state changes: