diff options
| author | 2019-11-18 18:35:21 -0300 | |
|---|---|---|
| committer | 2019-11-22 21:28:48 -0300 | |
| commit | c8a48aacc0a2bfe87de74e0aa7842f5d1aec1558 (patch) | |
| tree | 472a1edcad13f148cf2dc7c25de0cd7b6206e83f /src/video_core/shader | |
| parent | gl_rasterizer: Bind graphics images to draw commands (diff) | |
| download | yuzu-c8a48aacc0a2bfe87de74e0aa7842f5d1aec1558.tar.gz yuzu-c8a48aacc0a2bfe87de74e0aa7842f5d1aec1558.tar.xz yuzu-c8a48aacc0a2bfe87de74e0aa7842f5d1aec1558.zip | |
video_core: Unify ProgramType and ShaderStage into ShaderType
Diffstat (limited to 'src/video_core/shader')
| -rw-r--r-- | src/video_core/shader/const_buffer_locker.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/shader/const_buffer_locker.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/video_core/shader/const_buffer_locker.cpp b/src/video_core/shader/const_buffer_locker.cpp index fe467608e..b65399f91 100644 --- a/src/video_core/shader/const_buffer_locker.cpp +++ b/src/video_core/shader/const_buffer_locker.cpp | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include "common/assert.h" | 9 | #include "common/assert.h" |
| 10 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 11 | #include "video_core/engines/maxwell_3d.h" | 11 | #include "video_core/engines/maxwell_3d.h" |
| 12 | #include "video_core/engines/shader_type.h" | ||
| 12 | #include "video_core/shader/const_buffer_locker.h" | 13 | #include "video_core/shader/const_buffer_locker.h" |
| 13 | 14 | ||
| 14 | namespace VideoCommon::Shader { | 15 | namespace VideoCommon::Shader { |
diff --git a/src/video_core/shader/const_buffer_locker.h b/src/video_core/shader/const_buffer_locker.h index 600e2f3c3..50a8ce42a 100644 --- a/src/video_core/shader/const_buffer_locker.h +++ b/src/video_core/shader/const_buffer_locker.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 9 | #include "common/hash.h" | 9 | #include "common/hash.h" |
| 10 | #include "video_core/engines/const_buffer_engine_interface.h" | 10 | #include "video_core/engines/const_buffer_engine_interface.h" |
| 11 | #include "video_core/engines/shader_type.h" | ||
| 11 | 12 | ||
| 12 | namespace VideoCommon::Shader { | 13 | namespace VideoCommon::Shader { |
| 13 | 14 | ||
| @@ -20,7 +21,7 @@ using BindlessSamplerMap = | |||
| 20 | * The ConstBufferLocker is a class use to interface the 3D and compute engines with the shader | 21 | * The ConstBufferLocker is a class use to interface the 3D and compute engines with the shader |
| 21 | * compiler. with it, the shader can obtain required data from GPU state and store it for disk | 22 | * compiler. with it, the shader can obtain required data from GPU state and store it for disk |
| 22 | * shader compilation. | 23 | * shader compilation. |
| 23 | **/ | 24 | */ |
| 24 | class ConstBufferLocker { | 25 | class ConstBufferLocker { |
| 25 | public: | 26 | public: |
| 26 | explicit ConstBufferLocker(Tegra::Engines::ShaderType shader_stage); | 27 | explicit ConstBufferLocker(Tegra::Engines::ShaderType shader_stage); |