yuzu-emu/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-27 17:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3241 from ReinUsesLisp/gl-shader-cache

Browse Source 
gl_shader_cache: Style changes
This commit is contained in:
bunnei 2019-12-22 16:23:46 -05:00 committed by GitHub
commit e976d0e924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/video_core/renderer_opengl/gl_shader_cache.cpp
View File

@ -112,25 +112,25 @@ constexpr GLenum GetGLShaderType(ShaderType shader_type) {
} }
/// Describes primitive behavior on geometry shaders /// Describes primitive behavior on geometry shaders
constexpr std::tuple<const char*, const char*, u32> GetPrimitiveDescription(GLenum primitive_mode) { constexpr std::pair<const char*, u32> GetPrimitiveDescription(GLenum primitive_mode) {
switch (primitive_mode) { switch (primitive_mode) {
case GL_POINTS: case GL_POINTS:
return {"points", "Points", 1}; return {"points", 1};
case GL_LINES: case GL_LINES:
case GL_LINE_STRIP: case GL_LINE_STRIP:
return {"lines", "Lines", 2}; return {"lines", 2};
case GL_LINES_ADJACENCY: case GL_LINES_ADJACENCY:
case GL_LINE_STRIP_ADJACENCY: case GL_LINE_STRIP_ADJACENCY:
return {"lines_adjacency", "LinesAdj", 4}; return {"lines_adjacency", 4};
case GL_TRIANGLES: case GL_TRIANGLES:
case GL_TRIANGLE_STRIP: case GL_TRIANGLE_STRIP:
case GL_TRIANGLE_FAN: case GL_TRIANGLE_FAN:
return {"triangles", "Triangles", 3}; return {"triangles", 3};
case GL_TRIANGLES_ADJACENCY: case GL_TRIANGLES_ADJACENCY:
case GL_TRIANGLE_STRIP_ADJACENCY: case GL_TRIANGLE_STRIP_ADJACENCY:
return {"triangles_adjacency", "TrianglesAdj", 6}; return {"triangles_adjacency", 6};
default: default:
return {"points", "Invalid", 1}; return {"points", 1};
} }
} }
@ -264,30 +264,25 @@ CachedProgram BuildShader(const Device& device, u64 unique_identifier, ShaderTyp
"#extension GL_NV_shader_thread_group : require\n" "#extension GL_NV_shader_thread_group : require\n"
"#extension GL_NV_shader_thread_shuffle : require\n"; "#extension GL_NV_shader_thread_shuffle : require\n";
} }
source += '\n';
if (shader_type == ShaderType::Geometry) { if (shader_type == ShaderType::Geometry) {
const auto [glsl_topology, debug_name, max_vertices] = const auto [glsl_topology, max_vertices] = GetPrimitiveDescription(variant.primitive_mode);
GetPrimitiveDescription(variant.primitive_mode);
source += fmt::format("layout ({}) in;\n\n", glsl_topology);
source += fmt::format("#define MAX_VERTEX_INPUT {}\n", max_vertices); source += fmt::format("#define MAX_VERTEX_INPUT {}\n", max_vertices);
source += fmt::format("layout ({}) in;\n", glsl_topology);
} }
if (shader_type == ShaderType::Compute) { if (shader_type == ShaderType::Compute) {
if (variant.local_memory_size > 0) {
source += fmt::format("#define LOCAL_MEMORY_SIZE {}\n",
Common::AlignUp(variant.local_memory_size, 4) / 4);
}
source += source +=
fmt::format("layout (local_size_x = {}, local_size_y = {}, local_size_z = {}) in;\n", fmt::format("layout (local_size_x = {}, local_size_y = {}, local_size_z = {}) in;\n",
variant.block_x, variant.block_y, variant.block_z); variant.block_x, variant.block_y, variant.block_z);
if (variant.shared_memory_size > 0) { if (variant.shared_memory_size > 0) {
// TODO(Rodrigo): We should divide by four here, but having a larger shared memory pool // shared_memory_size is described in number of words
// avoids out of bound stores. Find out why shared memory size is being invalid.
source += fmt::format("shared uint smem[{}];\n", variant.shared_memory_size); source += fmt::format("shared uint smem[{}];\n", variant.shared_memory_size);
} }
if (variant.local_memory_size > 0) {
source += fmt::format("#define LOCAL_MEMORY_SIZE {}\n",
Common::AlignUp(variant.local_memory_size, 4) / 4);
}
} }
source += '\n'; source += '\n';