From fe31f1be6189b343d152ff9ff038b1d0d4ffca9f Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 26 May 2014 00:38:31 +0800 Subject: [PATCH] Re-enable glPrimitiveRestartIndex --- rpcs3/Emu/GS/GL/GLGSRender.cpp | 7 +++---- rpcs3/Emu/GS/GL/GLProcTable.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 26df787b92..f620eaacf9 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -866,7 +866,7 @@ void GLGSRender::ExecCMD() Enable(m_set_poly_offset_fill, GL_POLYGON_OFFSET_FILL); Enable(m_set_poly_offset_line, GL_POLYGON_OFFSET_LINE); Enable(m_set_poly_offset_point, GL_POLYGON_OFFSET_POINT); - //Enable(m_set_restart_index, GL_PRIMITIVE_RESTART); // Requires OpenGL 3.1+ + Enable(m_set_restart_index, GL_PRIMITIVE_RESTART); // Requires OpenGL 3.1+ if(m_set_clip_plane) { @@ -1067,9 +1067,8 @@ void GLGSRender::ExecCMD() if(m_set_restart_index) { - ConLog.Warning("m_set_restart_index requires glPrimitiveRestartIndex()"); - //glPrimitiveRestartIndex(m_restart_index); // Requires OpenGL 3.1+ - //checkForGlError("glPrimitiveRestartIndex"); + glPrimitiveRestartIndex(m_restart_index); // Requires OpenGL 3.1+ + checkForGlError("glPrimitiveRestartIndex"); } if(m_indexed_array.m_count && m_draw_array_count) diff --git a/rpcs3/Emu/GS/GL/GLProcTable.h b/rpcs3/Emu/GS/GL/GLProcTable.h index fb6acb64c7..22a6a004ab 100644 --- a/rpcs3/Emu/GS/GL/GLProcTable.h +++ b/rpcs3/Emu/GS/GL/GLProcTable.h @@ -96,6 +96,7 @@ OPENGL_PROC(PFNGLFRAMEBUFFERTEXTURE3DPROC, FramebufferTexture3D); OPENGL_PROC(PFNGLFRAMEBUFFERRENDERBUFFERPROC, FramebufferRenderbuffer); OPENGL_PROC(PFNGLBLITFRAMEBUFFERPROC, BlitFramebuffer); OPENGL_PROC(PFNGLDRAWBUFFERSPROC, DrawBuffers); +OPENGL_PROC(PFNGLPRIMITIVERESTARTINDEXPROC, PrimitiveRestartIndex); #ifndef __GNUG__ OPENGL_PROC(PFNGLBLENDCOLORPROC, BlendColor);