← Back to branch summary

~random-stuff/mupen64plus/mupen64plus-video-rice

~random-stuff/mupen64plus/mupen64plus-video-rice

Viewing all changes in revision 241.

Committer: Richard Goedeken
Date: 2016-03-06 15:48:24 UTC
mfrom: (240.1.1)
Revision ID: git-v1:7f1b3c2b1a1aac4b91d79eae7dc1d82c287e1392

Merge branch 'Narann-master', which completely re-writes the Rice Video pipeline to use only modern OpenGL shaders, with no legacy fixed pipeline rendering.

files removed:
src/CombinerTable.cpp

src/DecodedMux.cpp

src/DecodedMux.h

src/GeneralCombiner.cpp

src/GeneralCombiner.h

src/IColor.h

src/OGLDecodedMux.cpp

src/OGLDecodedMux.h

src/OGLES2FragmentShaders.cpp

src/OGLES2FragmentShaders.h

src/OGLExtCombiner.cpp

src/OGLExtCombiner.h

src/OGLExtRender.cpp

src/OGLExtRender.h

src/OGLFragmentShaders.cpp

src/OGLFragmentShaders.h

files modified:
projects/VisualStudio2013/mupen64plus-video-rice.vcxproj

projects/unix/Makefile

src/Combiner.cpp

src/Combiner.h

src/CombinerDefs.h

src/Config.cpp

src/Config.h

src/ConvertImage.cpp

src/ConvertImage16.cpp

src/Debugger.cpp

src/DeviceBuilder.cpp

src/DeviceBuilder.h

src/FrameBuffer.cpp

src/GraphicsContext.cpp

src/GraphicsContext.h

src/OGLCombiner.cpp

src/OGLCombiner.h

src/OGLExtensions.cpp

src/OGLExtensions.h

src/OGLGraphicsContext.cpp

src/OGLGraphicsContext.h

src/OGLRender.cpp

src/OGLRender.h

src/OGLRenderExt.cpp

src/OGLTexture.cpp

src/OGLTexture.h

src/RDP_Texture.h

src/RSP_GBI0.h

src/RSP_GBI1.h

src/RSP_GBI2.h

src/RSP_GBI_Others.h

src/RSP_Parser.cpp

src/RSP_Parser.h

src/RSP_S2DEX.cpp

src/Render.cpp

src/Render.h

src/RenderBase.cpp

src/RenderBase.h

src/RenderExt.cpp

src/Texture.cpp

src/Texture.h

src/TextureFilters.cpp

src/TextureManager.cpp

src/TextureManager.h

src/UcodeDefs.h

src/Video.cpp

src/osal_opengl.h

src/typedefs.h

Show diffs side-by-side

added added

removed removed

projects/VisualStudio2013/mupen64plus-video-rice.vcxproj

projects/unix/Makefile

src/Combiner.cpp

src/CombinerDefs.h

src/CombinerTable.cpp

src/ConvertImage.cpp

src/ConvertImage16.cpp

src/Debugger.cpp

src/DecodedMux.cpp

src/DecodedMux.h

src/DeviceBuilder.cpp

src/DeviceBuilder.h

src/FrameBuffer.cpp

src/GeneralCombiner.cpp

src/GeneralCombiner.h

src/GraphicsContext.cpp

src/GraphicsContext.h

src/OGLCombiner.cpp

src/OGLCombiner.h

src/OGLDecodedMux.cpp

src/OGLDecodedMux.h

src/OGLES2FragmentShaders.cpp

src/OGLES2FragmentShaders.h

src/OGLExtCombiner.cpp

src/OGLExtCombiner.h

src/OGLExtRender.cpp

src/OGLExtRender.h

src/OGLExtensions.cpp

src/OGLExtensions.h

src/OGLFragmentShaders.cpp

src/OGLFragmentShaders.h

src/OGLGraphicsContext.cpp

src/OGLGraphicsContext.h

src/OGLRender.cpp

src/OGLRender.h

src/OGLRenderExt.cpp

src/OGLTexture.cpp

src/OGLTexture.h

src/RDP_Texture.h

src/RSP_GBI_Others.h

src/RSP_Parser.cpp

src/RSP_Parser.h

src/RSP_S2DEX.cpp

src/RenderBase.cpp

src/RenderBase.h

src/RenderExt.cpp

src/Texture.cpp

src/TextureFilters.cpp

src/TextureManager.cpp

src/TextureManager.h

src/UcodeDefs.h

src/osal_opengl.h

Older »