Vkd3d mali

README.rst

@@ -6,7 +6,7 @@ Source
 ------
 
 This repository lives at https://gitlab.freedesktop.org/mesa/mesa.
-Other repositories are likely forks, and code found there is not supported. This particular repository has moved to https://github.com/Pipetto-crypto/mesa
+Other repositories are likely forks, and code found there is not supported. This is a fork of https://github.com/xMeM/mesa
 
 
 Build & install

src/vulkan/wrapper/spirv_patcher.cpp

@@ -1,5 +1,6 @@
 #include <vector>
 #include <map>
+#include <unordered_set>
 
 #include "spirv_patcher.hpp"
 #include "wrapper_log.h"
@@ -20,10 +21,17 @@ namespace OpCode {
    static const uint32_t OpCapability = 17;
    static const uint32_t OpConstantComposite = 44;
    static const uint32_t OpSpecConstantTrue = 48;
+   static const uint32_t OpSpecConstantFalse = 49;
+   static const uint32_t OpSpecConstant = 50;
    static const uint32_t OpSpecConstantComposite = 51;
    static const uint32_t OpDecorate = 71;
 }
 
+namespace OpType {
+	static const uint32_t OpTypeBool = 20;
+	static const uint32_t OpTypeVector = 23;
+}
+
 void
 remove_ClipDistance(uint32_t *pCode, size_t *codeSize)
 {
@@ -70,7 +78,9 @@ remove_ClipDistance(uint32_t *pCode, size_t *codeSize)
 void 
 patch_OpConstantComposite_to_OpSpecConstantComposite(uint32_t *pCode, uint32_t codeSize)
 {
-   std::vector <uint32_t> true_bool_constants;
+   std::unordered_set<uint32_t> bool_constants;
+   std::unordered_map<uint32_t, uint32_t> vector_bool_constants;
+   std::unordered_set<uint32_t> spec_constants;
    uint32_t offset = 5;
 
    while (offset < codeSize) {
@@ -81,13 +91,34 @@ patch_OpConstantComposite_to_OpSpecConstantComposite(uint32_t *pCode, uint32_t c
       if (length == 0 || offset + length > codeSize)
          break;
 
-      if (opcode == OpCode::OpSpecConstantTrue) 
-         true_bool_constants.push_back(pCode[offset + 2]);
+      if (opcode == OpType::OpTypeBool)
+         bool_constants.insert(pCode[offset + 1]);
+
+      if (opcode == OpType::OpTypeVector) {
+         uint32_t variable_id = pCode[offset + 1];
+      	 uint32_t component_type = pCode[offset + 2];
+      	 uint32_t component_number = pCode[offset + 3];
+      	 if (bool_constants.count(component_type))
+      	    vector_bool_constants[variable_id] = component_number;
+      }
+
+      if (opcode == OpCode::OpSpecConstantTrue || opcode == OpCode::OpSpecConstantFalse || opcode == OpCode::OpSpecConstant) 
+         spec_constants.insert(pCode[offset + 2]);
 
       if (opcode == OpCode::OpConstantComposite) {
-         uint32_t component = pCode[offset + 3];
-         if (std::find(true_bool_constants.begin(), true_bool_constants.end(), component) != true_bool_constants.end()) 
-            pCode[offset] = (pCode[offset] & ~0xffffu) | (OpCode::OpSpecConstantComposite & 0xffffu);
+         uint32_t component_type = pCode[offset + 1];
+         auto it = vector_bool_constants.find(component_type);
+         if (it != vector_bool_constants.end()) {
+         	uint32_t component_number = it->second;
+            uint32_t matches = 0;
+         	for (uint32_t index = 0; index < component_number; index ++) {
+               uint32_t component = pCode[offset + 3 + index];
+         	   if (spec_constants.count(component))
+         	      matches++;   	 
+         	}
+         	if (matches == component_number)
+         	   pCode[offset] = (pCode[offset] & ~0xffffu) | (OpCode::OpSpecConstantComposite & 0xffffu);
+         }
       }
 
       offset += length;