archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 07:21:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #274 from raven02/patch-22

Browse source 
GLGSRender: re-enable glPrimitiveRestartIndex
This commit is contained in:
B1ackDaemon 2014-05-25 22:39:33 +03:00
commit 948d4ef3a2
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/GS/GL/GLGSRender.cpp
View file

@ -866,7 +866,7 @@ void GLGSRender::ExecCMD()
Enable(m_set_poly_offset_fill, GL_POLYGON_OFFSET_FILL); 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_line, GL_POLYGON_OFFSET_LINE);
Enable(m_set_poly_offset_point, GL_POLYGON_OFFSET_POINT); 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) if(m_set_clip_plane)
{ {
@ -1067,9 +1067,8 @@ void GLGSRender::ExecCMD()
if(m_set_restart_index) if(m_set_restart_index)
{ {
ConLog.Warning("m_set_restart_index requires glPrimitiveRestartIndex()"); glPrimitiveRestartIndex(m_restart_index); // Requires OpenGL 3.1+
//glPrimitiveRestartIndex(m_restart_index); // Requires OpenGL 3.1+ checkForGlError("glPrimitiveRestartIndex");
//checkForGlError("glPrimitiveRestartIndex");
} }
if(m_indexed_array.m_count && m_draw_array_count) if(m_indexed_array.m_count && m_draw_array_count)

1
rpcs3/Emu/GS/GL/GLProcTable.h
View file

@ -96,6 +96,7 @@ OPENGL_PROC(PFNGLFRAMEBUFFERTEXTURE3DPROC, FramebufferTexture3D);
OPENGL_PROC(PFNGLFRAMEBUFFERRENDERBUFFERPROC, FramebufferRenderbuffer); OPENGL_PROC(PFNGLFRAMEBUFFERRENDERBUFFERPROC, FramebufferRenderbuffer);
OPENGL_PROC(PFNGLBLITFRAMEBUFFERPROC, BlitFramebuffer); OPENGL_PROC(PFNGLBLITFRAMEBUFFERPROC, BlitFramebuffer);
OPENGL_PROC(PFNGLDRAWBUFFERSPROC, DrawBuffers); OPENGL_PROC(PFNGLDRAWBUFFERSPROC, DrawBuffers);
OPENGL_PROC(PFNGLPRIMITIVERESTARTINDEXPROC, PrimitiveRestartIndex);
#ifndef __GNUG__ #ifndef __GNUG__
OPENGL_PROC(PFNGLBLENDCOLORPROC, BlendColor); OPENGL_PROC(PFNGLBLENDCOLORPROC, BlendColor);