ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #464 from DrChat/rect_cull_fix 

Disable GL_CULL_FACES when drawing rectangle lists
This commit is contained in:
Ben Vanik 2015-11-17 20:24:17 -08:00
parent a556316ba2 9ff8aa96e7
commit 69e26bcafd
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/gpu/gl4/draw_batcher.cc
View File

@ -242,6 +242,7 @@ bool DrawBatcher::CommitDraw() {
} }
bool DrawBatcher::Flush(FlushMode mode) { bool DrawBatcher::Flush(FlushMode mode) {
GLboolean cull_enabled = 0;
if (batch_state_.draw_count) { if (batch_state_.draw_count) {
#if FINE_GRAINED_DRAW_SCOPES #if FINE_GRAINED_DRAW_SCOPES
SCOPE_profile_cpu_f("gpu"); SCOPE_profile_cpu_f("gpu");
@ -289,6 +290,8 @@ bool DrawBatcher::Flush(FlushMode mode) {
// assert_true( // assert_true(
// (register_file_->values[XE_GPU_REG_PA_SU_SC_MODE_CNTL].u32 // (register_file_->values[XE_GPU_REG_PA_SU_SC_MODE_CNTL].u32
// & 0x3) == 0); // & 0x3) == 0);
cull_enabled = glIsEnabled(GL_CULL_FACE);
glDisable(GL_CULL_FACE);
break; break;
case PrimitiveType::kQuadList: case PrimitiveType::kQuadList:
prim_type = GL_LINES_ADJACENCY; prim_type = GL_LINES_ADJACENCY;
@ -342,6 +345,10 @@ bool DrawBatcher::Flush(FlushMode mode) {
batch_state_.draw_count = 0; batch_state_.draw_count = 0;
} }
if (batch_state_.prim_type == PrimitiveType::kRectangleList && cull_enabled) {
glEnable(GL_CULL_FACE);
}
if (mode == FlushMode::kReconfigure) { if (mode == FlushMode::kReconfigure) {
// Reset - we'll update it as soon as we have all the information. // Reset - we'll update it as soon as we have all the information.
batch_state_.needs_reconfigure = true; batch_state_.needs_reconfigure = true;