citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-24 16:05:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl_rasterizer: fallback to software shader path if buffer overflow happens on hardware shader path

Browse source
This commit is contained in:
wwylele 2018-05-18 13:55:19 +03:00
parent 6985b13439
commit dd6252a676
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -438,8 +438,7 @@ bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) {
if (!SetupGeometryShader()) if (!SetupGeometryShader())
return false; return false;
Draw(true, is_indexed); return Draw(true, is_indexed);
return true;
} }
static GLenum GetCurrentPrimitiveMode(bool use_gs) { static GLenum GetCurrentPrimitiveMode(bool use_gs) {
@ -475,12 +474,17 @@ static GLenum GetCurrentPrimitiveMode(bool use_gs) {
} }
} }
void RasterizerOpenGL::AccelerateDrawBatchInternal(bool is_indexed, bool use_gs) { bool RasterizerOpenGL::AccelerateDrawBatchInternal(bool is_indexed, bool use_gs) {
const auto& regs = Pica::g_state.regs; const auto& regs = Pica::g_state.regs;
GLenum primitive_mode = GetCurrentPrimitiveMode(use_gs); GLenum primitive_mode = GetCurrentPrimitiveMode(use_gs);
auto [vs_input_index_min, vs_input_index_max, vs_input_size] = AnalyzeVertexArray(is_indexed); auto [vs_input_index_min, vs_input_index_max, vs_input_size] = AnalyzeVertexArray(is_indexed);
if (vs_input_size > VERTEX_BUFFER_SIZE) {
NGLOG_WARNING(Render_OpenGL, "Too large vertex input size {}", vs_input_size);
return false;
}
state.draw.vertex_buffer = vertex_buffer.GetHandle(); state.draw.vertex_buffer = vertex_buffer.GetHandle();
state.Apply(); state.Apply();
@ -496,6 +500,12 @@ void RasterizerOpenGL::AccelerateDrawBatchInternal(bool is_indexed, bool use_gs)
if (is_indexed) { if (is_indexed) {
bool index_u16 = regs.pipeline.index_array.format != 0; bool index_u16 = regs.pipeline.index_array.format != 0;
std::size_t index_buffer_size = regs.pipeline.num_vertices * (index_u16 ? 2 : 1); std::size_t index_buffer_size = regs.pipeline.num_vertices * (index_u16 ? 2 : 1);
if (index_buffer_size > INDEX_BUFFER_SIZE) {
NGLOG_WARNING(Render_OpenGL, "Too large index input size {}", index_buffer_size);
return false;
}
const u8* index_data = const u8* index_data =
Memory::GetPhysicalPointer(regs.pipeline.vertex_attributes.GetPhysicalBaseAddress() + Memory::GetPhysicalPointer(regs.pipeline.vertex_attributes.GetPhysicalBaseAddress() +
regs.pipeline.index_array.offset); regs.pipeline.index_array.offset);
@ -510,6 +520,7 @@ void RasterizerOpenGL::AccelerateDrawBatchInternal(bool is_indexed, bool use_gs)
} else { } else {
glDrawArrays(primitive_mode, 0, regs.pipeline.num_vertices); glDrawArrays(primitive_mode, 0, regs.pipeline.num_vertices);
} }
return true;
} }
void RasterizerOpenGL::DrawTriangles() { void RasterizerOpenGL::DrawTriangles() {
@ -518,7 +529,7 @@ void RasterizerOpenGL::DrawTriangles() {
Draw(false, false); Draw(false, false);
} }
void RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) { bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
MICROPROFILE_SCOPE(OpenGL_Drawing); MICROPROFILE_SCOPE(OpenGL_Drawing);
const auto& regs = Pica::g_state.regs; const auto& regs = Pica::g_state.regs;
@ -746,8 +757,9 @@ void RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
state.Apply(); state.Apply();
// Draw the vertex batch // Draw the vertex batch
bool succeeded = true;
if (accelerate) { if (accelerate) {
AccelerateDrawBatchInternal(is_indexed, use_gs); succeeded = AccelerateDrawBatchInternal(is_indexed, use_gs);
} else { } else {
state.draw.vertex_array = sw_vao.handle; state.draw.vertex_array = sw_vao.handle;
state.draw.vertex_buffer = vertex_buffer.GetHandle(); state.draw.vertex_buffer = vertex_buffer.GetHandle();
@ -798,6 +810,8 @@ void RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
res_cache.InvalidateRegion(boost::icl::first(interval), boost::icl::length(interval), res_cache.InvalidateRegion(boost::icl::first(interval), boost::icl::length(interval),
depth_surface); depth_surface);
} }
return succeeded;
} }
void RasterizerOpenGL::NotifyPicaRegisterChanged(u32 id) { void RasterizerOpenGL::NotifyPicaRegisterChanged(u32 id) {

4
src/video_core/renderer_opengl/gl_rasterizer.h
View file

@ -221,10 +221,10 @@ private:
void UploadUniforms(bool accelerate_draw, bool use_gs); void UploadUniforms(bool accelerate_draw, bool use_gs);
/// Generic draw function for DrawTriangles and AccelerateDrawBatch /// Generic draw function for DrawTriangles and AccelerateDrawBatch
void Draw(bool accelerate, bool is_indexed); bool Draw(bool accelerate, bool is_indexed);
/// Internal implementation for AccelerateDrawBatch /// Internal implementation for AccelerateDrawBatch
void AccelerateDrawBatchInternal(bool is_indexed, bool use_gs); bool AccelerateDrawBatchInternal(bool is_indexed, bool use_gs);
struct VertexArrayInfo { struct VertexArrayInfo {
u32 vs_input_index_min; u32 vs_input_index_min;