diff options
| author | lat9nq <lat9nq@gmail.com> | 2021-07-25 15:31:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 15:31:33 -0400 |
| commit | 09d6cc99435322c5f480eaa2b0967e33f4966ba6 (patch) | |
| tree | 72cdf06f6b7d77fdf5826104fea691f3ea450f54 /src/video_core/renderer_opengl/renderer_opengl.h | |
| parent | d8b00fd863c8aa9fca02a479ce958899f1aadf24 (diff) | |
| parent | 7e272d3cd81656b65b21f5a569fc9a2d76cac758 (diff) | |
Merge branch 'master' into fullscreen-enum
Diffstat (limited to 'src/video_core/renderer_opengl/renderer_opengl.h')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 0b66f8332..d455f572f 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -12,7 +12,6 @@ #include "video_core/renderer_opengl/gl_device.h" #include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_resource_manager.h" -#include "video_core/renderer_opengl/gl_shader_manager.h" #include "video_core/renderer_opengl/gl_state_tracker.h" namespace Core { @@ -111,9 +110,8 @@ private: // OpenGL object IDs OGLSampler present_sampler; OGLBuffer vertex_buffer; - OGLProgram vertex_program; - OGLProgram fragment_program; - OGLPipeline pipeline; + OGLProgram present_vertex; + OGLProgram present_fragment; OGLFramebuffer screenshot_framebuffer; // GPU address of the vertex buffer |