~random-stuff/mupen64plus/mupen64plus-video-gliden64

« back to all changes in this revision

Viewing changes to src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp

Committer: Sergey Lipskiy
Author(s): fzurita
Date: 2019-04-08 03:51:18 UTC
Revision ID: git-v1:5df3f9dbacfe0086ad4f440c34a6e243fd50d7c0

Threaded GLideN64 calls

files added:
licenses/readerwriterqueue

licenses/readerwriterqueue/LICENSE.md

src/Graphics/OpenGLContext/ThreadedOpenGl

src/Graphics/OpenGLContext/ThreadedOpenGl/BlockingQueue.h

src/Graphics/OpenGLContext/ThreadedOpenGl/RingBufferPool.cpp

src/Graphics/OpenGLContext/ThreadedOpenGl/RingBufferPool.h

src/Graphics/OpenGLContext/ThreadedOpenGl/atomicops.h

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Command.cpp

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Command.h

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_ObjectPool.cpp

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_ObjectPool.h

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_WrappedFunctions.cpp

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_WrappedFunctions.h

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Wrapper.cpp

src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Wrapper.h

src/Graphics/OpenGLContext/ThreadedOpenGl/readerwriterqueue.h

src/Graphics/OpenGLContext/windows/WindowsWGL.cpp

src/Graphics/OpenGLContext/windows/WindowsWGL.h

files modified:
.gitignore

projects/msvc/GLideN64.vcxproj

projects/msvc/GLideN64.vcxproj.filters

src/CMakeLists.txt

src/Config.cpp

src/Config.h

src/GLideNUI/ConfigDialog.cpp

src/GLideNUI/Settings.cpp

src/GLideNUI/configDialog.ui

src/Graphics/OpenGLContext/GLFunctions.cpp

src/Graphics/OpenGLContext/GLFunctions.h

src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp

src/Graphics/OpenGLContext/mupen64plus/mupen64plus_DisplayWindow.cpp

src/Graphics/OpenGLContext/opengl_BufferedDrawer.cpp

src/Graphics/OpenGLContext/opengl_CachedFunctions.cpp

src/Graphics/OpenGLContext/opengl_CachedFunctions.h

src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp

src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h

src/Graphics/OpenGLContext/opengl_ContextImpl.cpp

src/Graphics/OpenGLContext/opengl_GLInfo.cpp

src/Graphics/OpenGLContext/windows/windows_DisplayWindow.cpp

src/Log.cpp

src/mupen64plus-video-gliden64.mk

src/mupenplus/Config_mupenplus.cpp

Show diffs side-by-side

added added

removed removed

src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp

2445

glAttachShader(program, bUseTextures ? m_vertexShaderTexturedTriangle : m_vertexShaderTriangle);

2446

glAttachShader(program, fragmentShader);

2447

if (CombinerInfo::get().isShaderCacheSupported()) {

2448

if (IS_GL_FUNCTION_VALID(glProgramParameteri))

2448

if (IS_GL_FUNCTION_VALID(ProgramParameteri))

2449

glProgramParameteri(program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);

2450

}

2451

glLinkProgram(program);

Older »