mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Move the generic vertex shader generator into GPU/Common and rename it.
This commit is contained in:
Henrik Rydgård
parent
be837912e1
commit
f4ea3ccf22
18 changed files with 52 additions and 65 deletions
|
|
@ -1250,8 +1250,6 @@ set(GPU_GLES
|
|||
GPU/GLES/TextureScalerGLES.h
|
||||
GPU/GLES/DrawEngineGLES.cpp
|
||||
GPU/GLES/DrawEngineGLES.h
|
||||
GPU/GLES/VertexShaderGeneratorGLES.cpp
|
||||
GPU/GLES/VertexShaderGeneratorGLES.h
|
||||
)
|
||||
|
||||
set(GPU_VULKAN
|
||||
|
|
@ -1340,6 +1338,8 @@ set(GPU_SOURCES
|
|||
GPU/Common/DepalettizeShaderCommon.h
|
||||
GPU/Common/FragmentShaderGenerator.cpp
|
||||
GPU/Common/FragmentShaderGenerator.h
|
||||
GPU/Common/VertexShaderGenerator.cpp
|
||||
GPU/Common/VertexShaderGenerator.h
|
||||
GPU/Common/FramebufferManagerCommon.cpp
|
||||
GPU/Common/FramebufferManagerCommon.h
|
||||
GPU/Common/GPUDebugInterface.cpp
|
||||
|
|
|
|||
|
|
@ -176,3 +176,16 @@ enum class PspAttributeLocation {
|
|||
|
||||
COUNT
|
||||
};
|
||||
|
||||
// Pre-fetched attrs and uniforms (used by GL only).
|
||||
enum {
|
||||
ATTR_POSITION = 0,
|
||||
ATTR_TEXCOORD = 1,
|
||||
ATTR_NORMAL = 2,
|
||||
ATTR_W1 = 3,
|
||||
ATTR_W2 = 4,
|
||||
ATTR_COLOR0 = 5,
|
||||
ATTR_COLOR1 = 6,
|
||||
|
||||
ATTR_COUNT,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,8 +27,7 @@
|
|||
#include "GPU/Common/ShaderId.h"
|
||||
#include "GPU/Common/ShaderUniforms.h"
|
||||
#include "GPU/Common/VertexDecoderCommon.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/GLES/ShaderManagerGLES.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
|
||||
#undef WRITE
|
||||
|
||||
|
|
@ -148,7 +147,7 @@ const char *hlsl_preamble_vs =
|
|||
"#define highp\n"
|
||||
"\n";
|
||||
|
||||
bool GenerateVertexShaderGLSL(const VShaderID &id, char *buffer, const ShaderLanguageDesc &compat, uint32_t *attrMask, uint64_t *uniformMask, std::string *errorString) {
|
||||
bool GenerateVertexShader(const VShaderID &id, char *buffer, const ShaderLanguageDesc &compat, uint32_t *attrMask, uint64_t *uniformMask, std::string *errorString) {
|
||||
*attrMask = 0;
|
||||
*uniformMask = 0;
|
||||
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
struct VShaderID;
|
||||
|
||||
bool GenerateVertexShaderGLSL(const VShaderID &id, char *buffer, const ShaderLanguageDesc &compat, uint32_t *attrMask, uint64_t *uniformMask, std::string *errorString);
|
||||
bool GenerateVertexShader(const VShaderID &id, char *buffer, const ShaderLanguageDesc &compat, uint32_t *attrMask, uint64_t *uniformMask, std::string *errorString);
|
||||
|
||||
// D3D9 constants.
|
||||
enum {
|
||||
|
|
@ -34,8 +34,8 @@
|
|||
#include "GPU/Math3D.h"
|
||||
#include "GPU/GPUState.h"
|
||||
#include "GPU/ge_constants.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
#include "GPU/D3D11/ShaderManagerD3D11.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/D3D11/D3D11Util.h"
|
||||
|
||||
D3D11FragmentShader::D3D11FragmentShader(ID3D11Device *device, D3D_FEATURE_LEVEL featureLevel, FShaderID id, const char *code, bool useHWTransform)
|
||||
|
|
@ -210,7 +210,7 @@ void ShaderManagerD3D11::GetShaders(int prim, u32 vertType, D3D11VertexShader **
|
|||
std::string genErrorString;
|
||||
uint32_t attrMask;
|
||||
uint64_t uniformMask;
|
||||
GenerateVertexShaderGLSL(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &genErrorString);
|
||||
GenerateVertexShader(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &genErrorString);
|
||||
vs = new D3D11VertexShader(device_, featureLevel_, VSID, codeBuffer_, vertType, useHWTransform);
|
||||
vsCache_[VSID] = vs;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -582,7 +582,7 @@ VSShader *ShaderManagerDX9::ApplyShader(bool useHWTransform, bool useHWTessellat
|
|||
std::string genErrorString;
|
||||
uint32_t attrMask;
|
||||
uint64_t uniformMask;
|
||||
if (GenerateVertexShaderGLSL(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &genErrorString)) {
|
||||
if (GenerateVertexShader(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &genErrorString)) {
|
||||
vs = new VSShader(device_, VSID, codeBuffer_, useHWTransform);
|
||||
}
|
||||
if (!vs || vs->Failed()) {
|
||||
|
|
@ -607,7 +607,7 @@ VSShader *ShaderManagerDX9::ApplyShader(bool useHWTransform, bool useHWTessellat
|
|||
// Can still work with software transform.
|
||||
uint32_t attrMask;
|
||||
uint64_t uniformMask;
|
||||
bool success = GenerateVertexShaderGLSL(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &genErrorString);
|
||||
bool success = GenerateVertexShader(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &genErrorString);
|
||||
_assert_(success);
|
||||
vs = new VSShader(device_, VSID, codeBuffer_, false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <cstdint>
|
||||
|
||||
#include "Common/Common.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
#include "GPU/Common/FragmentShaderGenerator.h"
|
||||
#include "GPU/Common/ShaderCommon.h"
|
||||
#include "GPU/Common/ShaderId.h"
|
||||
|
|
|
|||
|
|
@ -721,7 +721,7 @@ Shader *ShaderManagerGLES::CompileVertexShader(VShaderID VSID) {
|
|||
uint32_t attrMask;
|
||||
uint64_t uniformMask;
|
||||
std::string errorString;
|
||||
if (!GenerateVertexShaderGLSL(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &errorString)) {
|
||||
if (!GenerateVertexShader(VSID, codeBuffer_, compat_, &attrMask, &uniformMask, &errorString)) {
|
||||
ERROR_LOG(G3D, "Shader gen error: %s", errorString.c_str());
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,24 +23,11 @@
|
|||
#include "Common/GPU/OpenGL/GLRenderManager.h"
|
||||
#include "GPU/Common/ShaderCommon.h"
|
||||
#include "GPU/Common/ShaderId.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
#include "GPU/Common/FragmentShaderGenerator.h"
|
||||
|
||||
class Shader;
|
||||
|
||||
// Pre-fetched attrs and uniforms
|
||||
enum {
|
||||
ATTR_POSITION = 0,
|
||||
ATTR_TEXCOORD = 1,
|
||||
ATTR_NORMAL = 2,
|
||||
ATTR_W1 = 3,
|
||||
ATTR_W2 = 4,
|
||||
ATTR_COLOR0 = 5,
|
||||
ATTR_COLOR1 = 6,
|
||||
|
||||
ATTR_COUNT,
|
||||
};
|
||||
|
||||
class LinkedShader {
|
||||
public:
|
||||
LinkedShader(GLRenderManager *render, VShaderID VSID, Shader *vs, FShaderID FSID, Shader *fs, bool useHWTransform, bool preloading = false);
|
||||
|
|
|
|||
|
|
@ -368,6 +368,7 @@
|
|||
<ClInclude Include="Common\TextureScalerCommon.h" />
|
||||
<ClInclude Include="Common\TransformCommon.h" />
|
||||
<ClInclude Include="Common\VertexDecoderCommon.h" />
|
||||
<ClInclude Include="Common\VertexShaderGenerator.h" />
|
||||
<ClInclude Include="D3D11\D3D11Util.h" />
|
||||
<ClInclude Include="D3D11\DepalettizeShaderD3D11.h" />
|
||||
<ClInclude Include="D3D11\DrawEngineD3D11.h" />
|
||||
|
|
@ -446,12 +447,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GLES\VertexShaderGeneratorGLES.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GPU.h" />
|
||||
<ClInclude Include="GPUCommon.h" />
|
||||
<ClInclude Include="GPUInterface.h" />
|
||||
|
|
@ -536,6 +531,7 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\VertexShaderGenerator.cpp" />
|
||||
<ClCompile Include="D3D11\D3D11Util.cpp" />
|
||||
<ClCompile Include="D3D11\DepalettizeShaderD3D11.cpp" />
|
||||
<ClCompile Include="D3D11\DrawEngineD3D11.cpp" />
|
||||
|
|
@ -628,12 +624,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GLES\VertexShaderGeneratorGLES.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GPU.cpp" />
|
||||
<ClCompile Include="GPUCommon.cpp" />
|
||||
<ClCompile Include="GPUState.cpp" />
|
||||
|
|
|
|||
|
|
@ -189,9 +189,6 @@
|
|||
<ClInclude Include="GLES\DepalettizeShaderGLES.h">
|
||||
<Filter>GLES</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GLES\VertexShaderGeneratorGLES.h">
|
||||
<Filter>GLES</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GLES\FramebufferManagerGLES.h">
|
||||
<Filter>GLES</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -270,6 +267,9 @@
|
|||
<ClInclude Include="Common\FragmentShaderGenerator.h">
|
||||
<Filter>Common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Common\VertexShaderGenerator.h">
|
||||
<Filter>Common</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="Math3D.cpp">
|
||||
|
|
@ -443,9 +443,6 @@
|
|||
<ClCompile Include="GLES\DepalettizeShaderGLES.cpp">
|
||||
<Filter>GLES</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GLES\VertexShaderGeneratorGLES.cpp">
|
||||
<Filter>GLES</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GLES\FramebufferManagerGLES.cpp">
|
||||
<Filter>GLES</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -539,5 +536,8 @@
|
|||
<ClCompile Include="Common\FragmentShaderGenerator.cpp">
|
||||
<Filter>Common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Common\VertexShaderGenerator.cpp">
|
||||
<Filter>Common</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -36,11 +36,11 @@
|
|||
#include "GPU/Math3D.h"
|
||||
#include "GPU/GPUState.h"
|
||||
#include "GPU/ge_constants.h"
|
||||
#include "GPU/Common/FragmentShaderGenerator.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
#include "GPU/Vulkan/ShaderManagerVulkan.h"
|
||||
#include "GPU/Vulkan/DrawEngineVulkan.h"
|
||||
#include "GPU/Vulkan/FramebufferManagerVulkan.h"
|
||||
#include "GPU/Common/FragmentShaderGenerator.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
|
||||
VulkanFragmentShader::VulkanFragmentShader(VulkanContext *vulkan, FShaderID id, const char *code)
|
||||
: vulkan_(vulkan), id_(id), failed_(false), module_(0) {
|
||||
|
|
@ -265,7 +265,7 @@ void ShaderManagerVulkan::GetShaders(int prim, u32 vertType, VulkanVertexShader
|
|||
std::string genErrorString;
|
||||
uint64_t uniformMask = 0; // Not used
|
||||
uint32_t attributeMask = 0; // Not used
|
||||
bool success = GenerateVertexShaderGLSL(VSID, codeBuffer_, compat_, &attributeMask, &uniformMask, &genErrorString);
|
||||
bool success = GenerateVertexShader(VSID, codeBuffer_, compat_, &attributeMask, &uniformMask, &genErrorString);
|
||||
_assert_(success);
|
||||
vs = new VulkanVertexShader(vulkan_, VSID, codeBuffer_, useHWTransform);
|
||||
vsCache_.Insert(VSID, vs);
|
||||
|
|
@ -398,7 +398,7 @@ bool ShaderManagerVulkan::LoadCache(FILE *f) {
|
|||
std::string genErrorString;
|
||||
uint32_t attributeMask = 0;
|
||||
uint64_t uniformMask = 0;
|
||||
if (!GenerateVertexShaderGLSL(id, codeBuffer_, compat_, &attributeMask, &uniformMask, &genErrorString)) {
|
||||
if (!GenerateVertexShader(id, codeBuffer_, compat_, &attributeMask, &uniformMask, &genErrorString)) {
|
||||
return false;
|
||||
}
|
||||
VulkanVertexShader *vs = new VulkanVertexShader(vulkan_, id, codeBuffer_, useHWTransform);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "Common/GPU/Vulkan/VulkanMemory.h"
|
||||
#include "GPU/Common/ShaderCommon.h"
|
||||
#include "GPU/Common/ShaderId.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
#include "GPU/Common/FragmentShaderGenerator.h"
|
||||
#include "GPU/Vulkan/VulkanUtil.h"
|
||||
#include "Common/Math/lin/matrix4x4.h"
|
||||
|
|
|
|||
|
|
@ -402,6 +402,7 @@
|
|||
<ClInclude Include="..\..\GPU\Common\TextureScalerCommon.h" />
|
||||
<ClInclude Include="..\..\GPU\Common\TransformCommon.h" />
|
||||
<ClInclude Include="..\..\GPU\Common\VertexDecoderCommon.h" />
|
||||
<ClInclude Include="..\..\GPU\Common\VertexShaderGenerator.h" />
|
||||
<ClInclude Include="..\..\GPU\D3D11\D3D11Util.h" />
|
||||
<ClInclude Include="..\..\GPU\D3D11\DepalettizeShaderD3D11.h" />
|
||||
<ClInclude Include="..\..\GPU\D3D11\DrawEngineD3D11.h" />
|
||||
|
|
@ -417,7 +418,6 @@
|
|||
<ClInclude Include="..\..\GPU\Debugger\Record.h" />
|
||||
<ClInclude Include="..\..\GPU\Debugger\RecordFormat.h" />
|
||||
<ClInclude Include="..\..\GPU\Debugger\Stepping.h" />
|
||||
<ClInclude Include="..\..\GPU\Directx9\VertexShaderGeneratorHLSL.h" />
|
||||
<ClInclude Include="..\..\GPU\GeDisasm.h" />
|
||||
<ClInclude Include="..\..\GPU\ge_constants.h" />
|
||||
<ClInclude Include="..\..\GPU\GPU.h" />
|
||||
|
|
@ -462,6 +462,7 @@
|
|||
<ClCompile Include="..\..\GPU\Common\VertexDecoderCommon.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Common\VertexDecoderFake.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Common\VertexDecoderX86.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Common\VertexShaderGenerator.cpp" />
|
||||
<ClCompile Include="..\..\GPU\D3D11\D3D11Util.cpp" />
|
||||
<ClCompile Include="..\..\GPU\D3D11\DepalettizeShaderD3D11.cpp" />
|
||||
<ClCompile Include="..\..\GPU\D3D11\DrawEngineD3D11.cpp" />
|
||||
|
|
@ -477,7 +478,6 @@
|
|||
<ClCompile Include="..\..\GPU\Debugger\Playback.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Debugger\Record.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Debugger\Stepping.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Directx9\VertexShaderGeneratorHLSL.cpp" />
|
||||
<ClCompile Include="..\..\GPU\GeConstants.cpp" />
|
||||
<ClCompile Include="..\..\GPU\GeDisasm.cpp" />
|
||||
<ClCompile Include="..\..\GPU\GPU.cpp" />
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
<ClCompile Include="..\..\GPU\Debugger\Playback.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Debugger\Record.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Debugger\Stepping.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Directx9\VertexShaderGeneratorHLSL.cpp" />
|
||||
<ClCompile Include="..\..\GPU\GeConstants.cpp" />
|
||||
<ClCompile Include="..\..\GPU\GeDisasm.cpp" />
|
||||
<ClCompile Include="..\..\GPU\GPU.cpp" />
|
||||
|
|
@ -57,6 +56,7 @@
|
|||
<ClCompile Include="pch.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Software\RasterizerRectangle.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Common\FragmentShaderGenerator.cpp" />
|
||||
<ClCompile Include="..\..\GPU\Common\VertexShaderGenerator.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\GPU\Common\DepalettizeShaderCommon.h" />
|
||||
|
|
@ -96,7 +96,6 @@
|
|||
<ClInclude Include="..\..\GPU\Debugger\Record.h" />
|
||||
<ClInclude Include="..\..\GPU\Debugger\RecordFormat.h" />
|
||||
<ClInclude Include="..\..\GPU\Debugger\Stepping.h" />
|
||||
<ClInclude Include="..\..\GPU\Directx9\VertexShaderGeneratorHLSL.h" />
|
||||
<ClInclude Include="..\..\GPU\GeDisasm.h" />
|
||||
<ClInclude Include="..\..\GPU\ge_constants.h" />
|
||||
<ClInclude Include="..\..\GPU\GPU.h" />
|
||||
|
|
@ -114,5 +113,6 @@
|
|||
<ClInclude Include="targetver.h" />
|
||||
<ClInclude Include="..\..\GPU\Software\RasterizerRectangle.h" />
|
||||
<ClInclude Include="..\..\GPU\Common\FragmentShaderGenerator.h" />
|
||||
<ClInclude Include="..\..\GPU\Common\VertexShaderGenerator.h" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -326,6 +326,7 @@ EXEC_AND_LIB_FILES := \
|
|||
$(SRC)/GPU/Common/TextureDecoder.cpp \
|
||||
$(SRC)/GPU/Common/PostShader.cpp \
|
||||
$(SRC)/GPU/Common/ShaderUniforms.cpp \
|
||||
$(SRC)/GPU/Common/VertexShaderGenerator.cpp \
|
||||
$(SRC)/GPU/Debugger/Breakpoints.cpp \
|
||||
$(SRC)/GPU/Debugger/Debugger.cpp \
|
||||
$(SRC)/GPU/Debugger/Playback.cpp \
|
||||
|
|
@ -333,14 +334,13 @@ EXEC_AND_LIB_FILES := \
|
|||
$(SRC)/GPU/Debugger/Stepping.cpp \
|
||||
$(SRC)/GPU/GLES/FramebufferManagerGLES.cpp \
|
||||
$(SRC)/GPU/GLES/DepalettizeShaderGLES.cpp \
|
||||
$(SRC)/GPU/GLES/DepthBufferGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/DepthBufferGLES.cpp \
|
||||
$(SRC)/GPU/GLES/GPU_GLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/StencilBufferGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/StencilBufferGLES.cpp \
|
||||
$(SRC)/GPU/GLES/TextureCacheGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/DrawEngineGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/StateMappingGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/ShaderManagerGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/VertexShaderGeneratorGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/FragmentTestCacheGLES.cpp.arm \
|
||||
$(SRC)/GPU/GLES/TextureScalerGLES.cpp \
|
||||
$(SRC)/GPU/Null/NullGpu.cpp \
|
||||
|
|
|
|||
|
|
@ -249,6 +249,7 @@ SOURCES_CXX += \
|
|||
$(GPUDIR)/Debugger/Record.cpp \
|
||||
$(GPUDIR)/Debugger/Stepping.cpp \
|
||||
$(GPUDIR)/Common/FragmentShaderGenerator.cpp \
|
||||
$(GPUDIR)/Common/VertexShaderGenerator.cpp \
|
||||
$(GPUDIR)/Common/TextureCacheCommon.cpp \
|
||||
$(GPUDIR)/Common/TextureScalerCommon.cpp \
|
||||
$(GPUDIR)/Common/SoftwareTransformCommon.cpp \
|
||||
|
|
@ -269,7 +270,6 @@ SOURCES_CXX += \
|
|||
$(GPUDIR)/Software/RasterizerRectangle.cpp \
|
||||
$(GPUDIR)/GLES/DepalettizeShaderGLES.cpp \
|
||||
$(GPUDIR)/GLES/DepthBufferGLES.cpp \
|
||||
$(GPUDIR)/GLES/VertexShaderGeneratorGLES.cpp \
|
||||
$(GPUDIR)/GLES/DrawEngineGLES.cpp \
|
||||
$(GPUDIR)/GLES/GPU_GLES.cpp \
|
||||
$(GPUDIR)/GLES/FragmentTestCacheGLES.cpp \
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
#include "GPU/Vulkan/VulkanContext.h"
|
||||
|
||||
#include "GPU/Common/FragmentShaderGenerator.h"
|
||||
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/GLES/VertexShaderGeneratorGLES.h"
|
||||
#include "GPU/Common/VertexShaderGenerator.h"
|
||||
|
||||
#include "GPU/D3D11/D3D11Util.h"
|
||||
#include "GPU/D3D11/D3D11Loader.h"
|
||||
|
|
@ -60,27 +58,27 @@ bool GenerateVShader(VShaderID id, char *buffer, ShaderLanguage lang, std::strin
|
|||
case ShaderLanguage::GLSL_VULKAN:
|
||||
{
|
||||
ShaderLanguageDesc compat(ShaderLanguage::GLSL_VULKAN);
|
||||
return GenerateVertexShaderGLSL(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
return GenerateVertexShader(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
}
|
||||
case ShaderLanguage::GLSL_140:
|
||||
{
|
||||
ShaderLanguageDesc compat(ShaderLanguage::GLSL_140);
|
||||
return GenerateVertexShaderGLSL(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
return GenerateVertexShader(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
}
|
||||
case ShaderLanguage::GLSL_300:
|
||||
{
|
||||
ShaderLanguageDesc compat(ShaderLanguage::GLSL_140);
|
||||
return GenerateVertexShaderGLSL(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
return GenerateVertexShader(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
}
|
||||
case ShaderLanguage::HLSL_D3D9:
|
||||
{
|
||||
ShaderLanguageDesc compat(ShaderLanguage::HLSL_D3D9);
|
||||
return GenerateVertexShaderGLSL(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
return GenerateVertexShader(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
}
|
||||
case ShaderLanguage::HLSL_D3D11:
|
||||
{
|
||||
ShaderLanguageDesc compat(ShaderLanguage::HLSL_D3D11);
|
||||
return GenerateVertexShaderGLSL(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
return GenerateVertexShader(id, buffer, compat, &attrMask, &uniformMask, errorString);
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue