diff options
| author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-02-13 21:52:21 +0100 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-03-13 18:16:03 +0100 |
| commit | f6566338ebd6559b0fbe61e1557ee735bf58dcdd (patch) | |
| tree | 6c4163d0dc21dbc5225ac99733de45504ee53e12 /src/video_core/renderer_opengl/util_shaders.cpp | |
| parent | renderer_opengl: Accelerate ASTC texture decoding with a compute shader (diff) | |
| download | yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.tar yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.tar.gz yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.tar.bz2 yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.tar.lz yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.tar.xz yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.tar.zst yuzu-f6566338ebd6559b0fbe61e1557ee735bf58dcdd.zip | |
Diffstat (limited to 'src/video_core/renderer_opengl/util_shaders.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/util_shaders.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/util_shaders.cpp b/src/video_core/renderer_opengl/util_shaders.cpp index 2a4220661..d0979dab1 100644 --- a/src/video_core/renderer_opengl/util_shaders.cpp +++ b/src/video_core/renderer_opengl/util_shaders.cpp @@ -14,6 +14,7 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/div_ceil.h" +#include "video_core/host_shaders/astc_decoder_comp.h" #include "video_core/host_shaders/block_linear_unswizzle_2d_comp.h" #include "video_core/host_shaders/block_linear_unswizzle_3d_comp.h" #include "video_core/host_shaders/opengl_copy_bc4_comp.h" @@ -62,17 +63,12 @@ size_t NumPixelsInCopy(const VideoCommon::ImageCopy& copy) { } // Anonymous namespace UtilShaders::UtilShaders(ProgramManager& program_manager_) - : program_manager{program_manager_}, + : program_manager{program_manager_}, astc_decoder_program(MakeProgram(ASTC_DECODER_COMP)), block_linear_unswizzle_2d_program(MakeProgram(BLOCK_LINEAR_UNSWIZZLE_2D_COMP)), block_linear_unswizzle_3d_program(MakeProgram(BLOCK_LINEAR_UNSWIZZLE_3D_COMP)), pitch_unswizzle_program(MakeProgram(PITCH_UNSWIZZLE_COMP)), copy_bgra_program(MakeProgram(OPENGL_COPY_BGRA_COMP)), copy_bc4_program(MakeProgram(OPENGL_COPY_BC4_COMP)) { - // TODO: Load shader string as a header - std::string astc_path = "astc_decoder.comp"; - std::ifstream t(astc_path); - std::string str((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>()); - astc_decoder_program = MakeProgram(str); MakeBuffers(); } |