Merge pull request #1112 from Subv/sampler_types
Shaders: Use the correct shader type when sampling textures.
This commit is contained in:
		| @@ -223,6 +223,13 @@ enum class PredicateResultMode : u64 { | |||||||
|     NotZero = 0x3, |     NotZero = 0x3, | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | enum class TextureType : u64 { | ||||||
|  |     Texture1D = 0, | ||||||
|  |     Texture2D = 1, | ||||||
|  |     Texture3D = 2, | ||||||
|  |     TextureCube = 3, | ||||||
|  | }; | ||||||
|  |  | ||||||
| union Instruction { | union Instruction { | ||||||
|     Instruction& operator=(const Instruction& instr) { |     Instruction& operator=(const Instruction& instr) { | ||||||
|         value = instr.value; |         value = instr.value; | ||||||
| @@ -434,6 +441,8 @@ union Instruction { | |||||||
|     } conversion; |     } conversion; | ||||||
|  |  | ||||||
|     union { |     union { | ||||||
|  |         BitField<28, 1, u64> array; | ||||||
|  |         BitField<29, 2, TextureType> texture_type; | ||||||
|         BitField<31, 4, u64> component_mask; |         BitField<31, 4, u64> component_mask; | ||||||
|  |  | ||||||
|         bool IsComponentEnabled(size_t component) const { |         bool IsComponentEnabled(size_t component) const { | ||||||
| @@ -442,9 +451,39 @@ union Instruction { | |||||||
|     } tex; |     } tex; | ||||||
|  |  | ||||||
|     union { |     union { | ||||||
|         BitField<50, 3, u64> component_mask_selector; |         BitField<28, 1, u64> array; | ||||||
|  |         BitField<29, 2, TextureType> texture_type; | ||||||
|  |         BitField<56, 2, u64> component; | ||||||
|  |     } tld4; | ||||||
|  |  | ||||||
|  |     union { | ||||||
|  |         BitField<52, 2, u64> component; | ||||||
|  |     } tld4s; | ||||||
|  |  | ||||||
|  |     union { | ||||||
|         BitField<0, 8, Register> gpr0; |         BitField<0, 8, Register> gpr0; | ||||||
|         BitField<28, 8, Register> gpr28; |         BitField<28, 8, Register> gpr28; | ||||||
|  |         BitField<50, 3, u64> component_mask_selector; | ||||||
|  |         BitField<53, 4, u64> texture_info; | ||||||
|  |  | ||||||
|  |         TextureType GetTextureType() const { | ||||||
|  |             // The TEXS instruction has a weird encoding for the texture type. | ||||||
|  |             if (texture_info == 0) | ||||||
|  |                 return TextureType::Texture1D; | ||||||
|  |             if (texture_info >= 1 && texture_info <= 9) | ||||||
|  |                 return TextureType::Texture2D; | ||||||
|  |             if (texture_info >= 10 && texture_info <= 11) | ||||||
|  |                 return TextureType::Texture3D; | ||||||
|  |             if (texture_info >= 12 && texture_info <= 13) | ||||||
|  |                 return TextureType::TextureCube; | ||||||
|  |  | ||||||
|  |             UNIMPLEMENTED(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         bool IsArrayTexture() const { | ||||||
|  |             // TEXS only supports Texture2D arrays. | ||||||
|  |             return texture_info >= 7 && texture_info <= 9; | ||||||
|  |         } | ||||||
|  |  | ||||||
|         bool HasTwoDestinations() const { |         bool HasTwoDestinations() const { | ||||||
|             return gpr28.Value() != Register::ZeroIndex; |             return gpr28.Value() != Register::ZeroIndex; | ||||||
| @@ -468,6 +507,31 @@ union Instruction { | |||||||
|         } |         } | ||||||
|     } texs; |     } texs; | ||||||
|  |  | ||||||
|  |     union { | ||||||
|  |         BitField<53, 4, u64> texture_info; | ||||||
|  |  | ||||||
|  |         TextureType GetTextureType() const { | ||||||
|  |             // The TLDS instruction has a weird encoding for the texture type. | ||||||
|  |             if (texture_info >= 0 && texture_info <= 1) { | ||||||
|  |                 return TextureType::Texture1D; | ||||||
|  |             } | ||||||
|  |             if (texture_info == 2 || texture_info == 8 || texture_info == 12 || | ||||||
|  |                 texture_info >= 4 && texture_info <= 6) { | ||||||
|  |                 return TextureType::Texture2D; | ||||||
|  |             } | ||||||
|  |             if (texture_info == 7) { | ||||||
|  |                 return TextureType::Texture3D; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             UNIMPLEMENTED(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         bool IsArrayTexture() const { | ||||||
|  |             // TEXS only supports Texture2D arrays. | ||||||
|  |             return texture_info == 8; | ||||||
|  |         } | ||||||
|  |     } tlds; | ||||||
|  |  | ||||||
|     union { |     union { | ||||||
|         BitField<20, 24, u64> target; |         BitField<20, 24, u64> target; | ||||||
|         BitField<5, 1, u64> constant_buffer; |         BitField<5, 1, u64> constant_buffer; | ||||||
| @@ -533,9 +597,11 @@ public: | |||||||
|         LDG, // Load from global memory |         LDG, // Load from global memory | ||||||
|         STG, // Store in global memory |         STG, // Store in global memory | ||||||
|         TEX, |         TEX, | ||||||
|         TEXQ, // Texture Query |         TEXQ,  // Texture Query | ||||||
|         TEXS, // Texture Fetch with scalar/non-vec4 source/destinations |         TEXS,  // Texture Fetch with scalar/non-vec4 source/destinations | ||||||
|         TLDS, // Texture Load with scalar/non-vec4 source/destinations |         TLDS,  // Texture Load with scalar/non-vec4 source/destinations | ||||||
|  |         TLD4,  // Texture Load 4 | ||||||
|  |         TLD4S, // Texture Load 4 with scalar / non - vec4 source / destinations | ||||||
|         EXIT, |         EXIT, | ||||||
|         IPA, |         IPA, | ||||||
|         FFMA_IMM, // Fused Multiply and Add |         FFMA_IMM, // Fused Multiply and Add | ||||||
| @@ -749,6 +815,8 @@ private: | |||||||
|             INST("1101111101001---", Id::TEXQ, Type::Memory, "TEXQ"), |             INST("1101111101001---", Id::TEXQ, Type::Memory, "TEXQ"), | ||||||
|             INST("1101100---------", Id::TEXS, Type::Memory, "TEXS"), |             INST("1101100---------", Id::TEXS, Type::Memory, "TEXS"), | ||||||
|             INST("1101101---------", Id::TLDS, Type::Memory, "TLDS"), |             INST("1101101---------", Id::TLDS, Type::Memory, "TLDS"), | ||||||
|  |             INST("110010----111---", Id::TLD4, Type::Memory, "TLD4"), | ||||||
|  |             INST("1101111100------", Id::TLD4S, Type::Memory, "TLD4S"), | ||||||
|             INST("111000110000----", Id::EXIT, Type::Trivial, "EXIT"), |             INST("111000110000----", Id::EXIT, Type::Trivial, "EXIT"), | ||||||
|             INST("11100000--------", Id::IPA, Type::Trivial, "IPA"), |             INST("11100000--------", Id::IPA, Type::Trivial, "IPA"), | ||||||
|             INST("0011001-1-------", Id::FFMA_IMM, Type::Ffma, "FFMA_IMM"), |             INST("0011001-1-------", Id::FFMA_IMM, Type::Ffma, "FFMA_IMM"), | ||||||
|   | |||||||
| @@ -439,13 +439,12 @@ public: | |||||||
|         } |         } | ||||||
|         declarations.AddNewLine(); |         declarations.AddNewLine(); | ||||||
|  |  | ||||||
|         // Append the sampler2D array for the used textures. |         const auto& samplers = GetSamplers(); | ||||||
|         size_t num_samplers = GetSamplers().size(); |         for (const auto& sampler : samplers) { | ||||||
|         if (num_samplers > 0) { |             declarations.AddLine("uniform " + sampler.GetTypeString() + ' ' + sampler.GetName() + | ||||||
|             declarations.AddLine("uniform sampler2D " + SamplerEntry::GetArrayName(stage) + '[' + |                                  ';'); | ||||||
|                                  std::to_string(num_samplers) + "];"); |  | ||||||
|             declarations.AddNewLine(); |  | ||||||
|         } |         } | ||||||
|  |         declarations.AddNewLine(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /// Returns a list of constant buffer declarations |     /// Returns a list of constant buffer declarations | ||||||
| @@ -457,13 +456,14 @@ public: | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     /// Returns a list of samplers used in the shader |     /// Returns a list of samplers used in the shader | ||||||
|     std::vector<SamplerEntry> GetSamplers() const { |     const std::vector<SamplerEntry>& GetSamplers() const { | ||||||
|         return used_samplers; |         return used_samplers; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /// Returns the GLSL sampler used for the input shader sampler, and creates a new one if |     /// Returns the GLSL sampler used for the input shader sampler, and creates a new one if | ||||||
|     /// necessary. |     /// necessary. | ||||||
|     std::string AccessSampler(const Sampler& sampler) { |     std::string AccessSampler(const Sampler& sampler, Tegra::Shader::TextureType type, | ||||||
|  |                               bool is_array) { | ||||||
|         size_t offset = static_cast<size_t>(sampler.index.Value()); |         size_t offset = static_cast<size_t>(sampler.index.Value()); | ||||||
|  |  | ||||||
|         // If this sampler has already been used, return the existing mapping. |         // If this sampler has already been used, return the existing mapping. | ||||||
| @@ -472,12 +472,13 @@ public: | |||||||
|                          [&](const SamplerEntry& entry) { return entry.GetOffset() == offset; }); |                          [&](const SamplerEntry& entry) { return entry.GetOffset() == offset; }); | ||||||
|  |  | ||||||
|         if (itr != used_samplers.end()) { |         if (itr != used_samplers.end()) { | ||||||
|  |             ASSERT(itr->GetType() == type && itr->IsArray() == is_array); | ||||||
|             return itr->GetName(); |             return itr->GetName(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         // Otherwise create a new mapping for this sampler |         // Otherwise create a new mapping for this sampler | ||||||
|         size_t next_index = used_samplers.size(); |         size_t next_index = used_samplers.size(); | ||||||
|         SamplerEntry entry{stage, offset, next_index}; |         SamplerEntry entry{stage, offset, next_index, type, is_array}; | ||||||
|         used_samplers.emplace_back(entry); |         used_samplers.emplace_back(entry); | ||||||
|         return entry.GetName(); |         return entry.GetName(); | ||||||
|     } |     } | ||||||
| @@ -638,8 +639,8 @@ private: | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     /// Generates code representing a texture sampler. |     /// Generates code representing a texture sampler. | ||||||
|     std::string GetSampler(const Sampler& sampler) { |     std::string GetSampler(const Sampler& sampler, Tegra::Shader::TextureType type, bool is_array) { | ||||||
|         return regs.AccessSampler(sampler); |         return regs.AccessSampler(sampler, type, is_array); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
| @@ -1507,10 +1508,29 @@ private: | |||||||
|                 break; |                 break; | ||||||
|             } |             } | ||||||
|             case OpCode::Id::TEX: { |             case OpCode::Id::TEX: { | ||||||
|                 const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8); |                 ASSERT_MSG(instr.tex.array == 0, "TEX arrays unimplemented"); | ||||||
|                 const std::string op_b = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1); |                 std::string coord{}; | ||||||
|                 const std::string sampler = GetSampler(instr.sampler); |  | ||||||
|                 const std::string coord = "vec2 coords = vec2(" + op_a + ", " + op_b + ");"; |                 switch (instr.tex.texture_type) { | ||||||
|  |                 case Tegra::Shader::TextureType::Texture2D: { | ||||||
|  |                     std::string x = regs.GetRegisterAsFloat(instr.gpr8); | ||||||
|  |                     std::string y = regs.GetRegisterAsFloat(instr.gpr20); | ||||||
|  |                     coord = "vec2 coords = vec2(" + x + ", " + y + ");"; | ||||||
|  |                     break; | ||||||
|  |                 } | ||||||
|  |                 case Tegra::Shader::TextureType::Texture3D: { | ||||||
|  |                     std::string x = regs.GetRegisterAsFloat(instr.gpr8); | ||||||
|  |                     std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1); | ||||||
|  |                     std::string z = regs.GetRegisterAsFloat(instr.gpr20); | ||||||
|  |                     coord = "vec3 coords = vec3(" + x + ", " + y + ", " + z + ");"; | ||||||
|  |                     break; | ||||||
|  |                 } | ||||||
|  |                 default: | ||||||
|  |                     UNIMPLEMENTED(); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 const std::string sampler = | ||||||
|  |                     GetSampler(instr.sampler, instr.tex.texture_type, instr.tex.array); | ||||||
|                 // Add an extra scope and declare the texture coords inside to prevent |                 // Add an extra scope and declare the texture coords inside to prevent | ||||||
|                 // overwriting them in case they are used as outputs of the texs instruction. |                 // overwriting them in case they are used as outputs of the texs instruction. | ||||||
|                 shader.AddLine("{"); |                 shader.AddLine("{"); | ||||||
| @@ -1532,24 +1552,115 @@ private: | |||||||
|                 break; |                 break; | ||||||
|             } |             } | ||||||
|             case OpCode::Id::TEXS: { |             case OpCode::Id::TEXS: { | ||||||
|                 const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8); |                 std::string coord{}; | ||||||
|                 const std::string op_b = regs.GetRegisterAsFloat(instr.gpr20); |  | ||||||
|                 const std::string sampler = GetSampler(instr.sampler); |                 switch (instr.texs.GetTextureType()) { | ||||||
|                 const std::string coord = "vec2 coords = vec2(" + op_a + ", " + op_b + ");"; |                 case Tegra::Shader::TextureType::Texture2D: { | ||||||
|  |                     if (instr.texs.IsArrayTexture()) { | ||||||
|  |                         std::string index = regs.GetRegisterAsInteger(instr.gpr8); | ||||||
|  |                         std::string x = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1); | ||||||
|  |                         std::string y = regs.GetRegisterAsFloat(instr.gpr20); | ||||||
|  |                         coord = "vec3 coords = vec3(" + x + ", " + y + ", " + index + ");"; | ||||||
|  |                     } else { | ||||||
|  |                         std::string x = regs.GetRegisterAsFloat(instr.gpr8); | ||||||
|  |                         std::string y = regs.GetRegisterAsFloat(instr.gpr20); | ||||||
|  |                         coord = "vec2 coords = vec2(" + x + ", " + y + ");"; | ||||||
|  |                     } | ||||||
|  |                     break; | ||||||
|  |                 } | ||||||
|  |                 case Tegra::Shader::TextureType::TextureCube: { | ||||||
|  |                     std::string x = regs.GetRegisterAsFloat(instr.gpr8); | ||||||
|  |                     std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1); | ||||||
|  |                     std::string z = regs.GetRegisterAsFloat(instr.gpr20); | ||||||
|  |                     coord = "vec3 coords = vec3(" + x + ", " + y + ", " + z + ");"; | ||||||
|  |                     break; | ||||||
|  |                 } | ||||||
|  |                 default: | ||||||
|  |                     UNIMPLEMENTED(); | ||||||
|  |                 } | ||||||
|  |                 const std::string sampler = GetSampler(instr.sampler, instr.texs.GetTextureType(), | ||||||
|  |                                                        instr.texs.IsArrayTexture()); | ||||||
|  |  | ||||||
|                 const std::string texture = "texture(" + sampler + ", coords)"; |                 const std::string texture = "texture(" + sampler + ", coords)"; | ||||||
|                 WriteTexsInstruction(instr, coord, texture); |                 WriteTexsInstruction(instr, coord, texture); | ||||||
|                 break; |                 break; | ||||||
|             } |             } | ||||||
|             case OpCode::Id::TLDS: { |             case OpCode::Id::TLDS: { | ||||||
|                 const std::string op_a = regs.GetRegisterAsInteger(instr.gpr8); |                 ASSERT(instr.tlds.GetTextureType() == Tegra::Shader::TextureType::Texture2D); | ||||||
|                 const std::string op_b = regs.GetRegisterAsInteger(instr.gpr20); |                 ASSERT(instr.tlds.IsArrayTexture() == false); | ||||||
|                 const std::string sampler = GetSampler(instr.sampler); |                 std::string coord{}; | ||||||
|                 const std::string coord = "ivec2 coords = ivec2(" + op_a + ", " + op_b + ");"; |  | ||||||
|  |                 switch (instr.tlds.GetTextureType()) { | ||||||
|  |                 case Tegra::Shader::TextureType::Texture2D: { | ||||||
|  |                     if (instr.tlds.IsArrayTexture()) { | ||||||
|  |                         UNIMPLEMENTED(); | ||||||
|  |                     } else { | ||||||
|  |                         std::string x = regs.GetRegisterAsInteger(instr.gpr8); | ||||||
|  |                         std::string y = regs.GetRegisterAsInteger(instr.gpr20); | ||||||
|  |                         coord = "ivec2 coords = ivec2(" + x + ", " + y + ");"; | ||||||
|  |                     } | ||||||
|  |                     break; | ||||||
|  |                 } | ||||||
|  |                 default: | ||||||
|  |                     UNIMPLEMENTED(); | ||||||
|  |                 } | ||||||
|  |                 const std::string sampler = GetSampler(instr.sampler, instr.tlds.GetTextureType(), | ||||||
|  |                                                        instr.tlds.IsArrayTexture()); | ||||||
|                 const std::string texture = "texelFetch(" + sampler + ", coords, 0)"; |                 const std::string texture = "texelFetch(" + sampler + ", coords, 0)"; | ||||||
|                 WriteTexsInstruction(instr, coord, texture); |                 WriteTexsInstruction(instr, coord, texture); | ||||||
|                 break; |                 break; | ||||||
|             } |             } | ||||||
|  |             case OpCode::Id::TLD4: { | ||||||
|  |                 ASSERT(instr.tld4.texture_type == Tegra::Shader::TextureType::Texture2D); | ||||||
|  |                 ASSERT(instr.tld4.array == 0); | ||||||
|  |                 std::string coord{}; | ||||||
|  |  | ||||||
|  |                 switch (instr.tld4.texture_type) { | ||||||
|  |                 case Tegra::Shader::TextureType::Texture2D: { | ||||||
|  |                     std::string x = regs.GetRegisterAsFloat(instr.gpr8); | ||||||
|  |                     std::string y = regs.GetRegisterAsFloat(instr.gpr8.Value() + 1); | ||||||
|  |                     coord = "vec2 coords = vec2(" + x + ", " + y + ");"; | ||||||
|  |                     break; | ||||||
|  |                 } | ||||||
|  |                 default: | ||||||
|  |                     UNIMPLEMENTED(); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 const std::string sampler = | ||||||
|  |                     GetSampler(instr.sampler, instr.tld4.texture_type, instr.tld4.array); | ||||||
|  |                 // Add an extra scope and declare the texture coords inside to prevent | ||||||
|  |                 // overwriting them in case they are used as outputs of the texs instruction. | ||||||
|  |                 shader.AddLine("{"); | ||||||
|  |                 ++shader.scope; | ||||||
|  |                 shader.AddLine(coord); | ||||||
|  |                 const std::string texture = "textureGather(" + sampler + ", coords, " + | ||||||
|  |                                             std::to_string(instr.tld4.component) + ')'; | ||||||
|  |  | ||||||
|  |                 size_t dest_elem{}; | ||||||
|  |                 for (size_t elem = 0; elem < 4; ++elem) { | ||||||
|  |                     if (!instr.tex.IsComponentEnabled(elem)) { | ||||||
|  |                         // Skip disabled components | ||||||
|  |                         continue; | ||||||
|  |                     } | ||||||
|  |                     regs.SetRegisterToFloat(instr.gpr0, elem, texture, 1, 4, false, dest_elem); | ||||||
|  |                     ++dest_elem; | ||||||
|  |                 } | ||||||
|  |                 --shader.scope; | ||||||
|  |                 shader.AddLine("}"); | ||||||
|  |                 break; | ||||||
|  |             } | ||||||
|  |             case OpCode::Id::TLD4S: { | ||||||
|  |                 const std::string op_a = regs.GetRegisterAsFloat(instr.gpr8); | ||||||
|  |                 const std::string op_b = regs.GetRegisterAsFloat(instr.gpr20); | ||||||
|  |                 // TODO(Subv): Figure out how the sampler type is encoded in the TLD4S instruction. | ||||||
|  |                 const std::string sampler = | ||||||
|  |                     GetSampler(instr.sampler, Tegra::Shader::TextureType::Texture2D, false); | ||||||
|  |                 const std::string coord = "vec2 coords = vec2(" + op_a + ", " + op_b + ");"; | ||||||
|  |                 const std::string texture = "textureGather(" + sampler + ", coords, " + | ||||||
|  |                                             std::to_string(instr.tld4s.component) + ')'; | ||||||
|  |                 WriteTexsInstruction(instr, coord, texture); | ||||||
|  |                 break; | ||||||
|  |             } | ||||||
|             default: { |             default: { | ||||||
|                 LOG_CRITICAL(HW_GPU, "Unhandled memory instruction: {}", opcode->GetName()); |                 LOG_CRITICAL(HW_GPU, "Unhandled memory instruction: {}", opcode->GetName()); | ||||||
|                 UNREACHABLE(); |                 UNREACHABLE(); | ||||||
|   | |||||||
| @@ -11,6 +11,7 @@ | |||||||
| #include <vector> | #include <vector> | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| #include "common/hash.h" | #include "common/hash.h" | ||||||
|  | #include "video_core/engines/shader_bytecode.h" | ||||||
|  |  | ||||||
| namespace GLShader { | namespace GLShader { | ||||||
|  |  | ||||||
| @@ -72,8 +73,9 @@ class SamplerEntry { | |||||||
|     using Maxwell = Tegra::Engines::Maxwell3D::Regs; |     using Maxwell = Tegra::Engines::Maxwell3D::Regs; | ||||||
|  |  | ||||||
| public: | public: | ||||||
|     SamplerEntry(Maxwell::ShaderStage stage, size_t offset, size_t index) |     SamplerEntry(Maxwell::ShaderStage stage, size_t offset, size_t index, | ||||||
|         : offset(offset), stage(stage), sampler_index(index) {} |                  Tegra::Shader::TextureType type, bool is_array) | ||||||
|  |         : offset(offset), stage(stage), sampler_index(index), type(type), is_array(is_array) {} | ||||||
|  |  | ||||||
|     size_t GetOffset() const { |     size_t GetOffset() const { | ||||||
|         return offset; |         return offset; | ||||||
| @@ -88,8 +90,41 @@ public: | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     std::string GetName() const { |     std::string GetName() const { | ||||||
|         return std::string(TextureSamplerNames[static_cast<size_t>(stage)]) + '[' + |         return std::string(TextureSamplerNames[static_cast<size_t>(stage)]) + '_' + | ||||||
|                std::to_string(sampler_index) + ']'; |                std::to_string(sampler_index); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     std::string GetTypeString() const { | ||||||
|  |         using Tegra::Shader::TextureType; | ||||||
|  |         std::string glsl_type; | ||||||
|  |  | ||||||
|  |         switch (type) { | ||||||
|  |         case TextureType::Texture1D: | ||||||
|  |             glsl_type = "sampler1D"; | ||||||
|  |             break; | ||||||
|  |         case TextureType::Texture2D: | ||||||
|  |             glsl_type = "sampler2D"; | ||||||
|  |             break; | ||||||
|  |         case TextureType::Texture3D: | ||||||
|  |             glsl_type = "sampler3D"; | ||||||
|  |             break; | ||||||
|  |         case TextureType::TextureCube: | ||||||
|  |             glsl_type = "samplerCube"; | ||||||
|  |             break; | ||||||
|  |         default: | ||||||
|  |             UNIMPLEMENTED(); | ||||||
|  |         } | ||||||
|  |         if (is_array) | ||||||
|  |             glsl_type += "Array"; | ||||||
|  |         return glsl_type; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     Tegra::Shader::TextureType GetType() const { | ||||||
|  |         return type; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     bool IsArray() const { | ||||||
|  |         return is_array; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     static std::string GetArrayName(Maxwell::ShaderStage stage) { |     static std::string GetArrayName(Maxwell::ShaderStage stage) { | ||||||
| @@ -100,11 +135,14 @@ private: | |||||||
|     static constexpr std::array<const char*, Maxwell::MaxShaderStage> TextureSamplerNames = { |     static constexpr std::array<const char*, Maxwell::MaxShaderStage> TextureSamplerNames = { | ||||||
|         "tex_vs", "tex_tessc", "tex_tesse", "tex_gs", "tex_fs", |         "tex_vs", "tex_tessc", "tex_tesse", "tex_gs", "tex_fs", | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     /// Offset in TSC memory from which to read the sampler object, as specified by the sampling |     /// Offset in TSC memory from which to read the sampler object, as specified by the sampling | ||||||
|     /// instruction. |     /// instruction. | ||||||
|     size_t offset; |     size_t offset; | ||||||
|     Maxwell::ShaderStage stage; ///< Shader stage where this sampler was used. |     Maxwell::ShaderStage stage;      ///< Shader stage where this sampler was used. | ||||||
|     size_t sampler_index;       ///< Value used to index into the generated GLSL sampler array. |     size_t sampler_index;            ///< Value used to index into the generated GLSL sampler array. | ||||||
|  |     Tegra::Shader::TextureType type; ///< The type used to sample this texture (Texture2D, etc) | ||||||
|  |     bool is_array; ///< Whether the texture is being sampled as an array texture or not. | ||||||
| }; | }; | ||||||
|  |  | ||||||
| struct ShaderEntries { | struct ShaderEntries { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 bunnei
					bunnei