diff options
| author | 2018-07-24 12:08:10 -0400 | |
|---|---|---|
| committer | 2018-07-24 12:08:12 -0400 | |
| commit | b5eb3905cdad545fc2c4c3141d0d3ff22183e442 (patch) | |
| tree | cc4ace278b400e2609bf9e12b1733b820404942e /src | |
| parent | Merge pull request #798 from lioncash/const (diff) | |
| download | yuzu-b5eb3905cdad545fc2c4c3141d0d3ff22183e442.tar.gz yuzu-b5eb3905cdad545fc2c4c3141d0d3ff22183e442.tar.xz yuzu-b5eb3905cdad545fc2c4c3141d0d3ff22183e442.zip | |
gl_rasterizer: Use in-class member initializers where applicable
We can just assign to the members directly in these cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 7 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 5d5ad84b7..d2ac067c0 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -37,11 +37,6 @@ MICROPROFILE_DEFINE(OpenGL_Blits, "OpenGL", "Blits", MP_RGB(100, 100, 255)); | |||
| 37 | MICROPROFILE_DEFINE(OpenGL_CacheManagement, "OpenGL", "Cache Mgmt", MP_RGB(100, 255, 100)); | 37 | MICROPROFILE_DEFINE(OpenGL_CacheManagement, "OpenGL", "Cache Mgmt", MP_RGB(100, 255, 100)); |
| 38 | 38 | ||
| 39 | RasterizerOpenGL::RasterizerOpenGL() { | 39 | RasterizerOpenGL::RasterizerOpenGL() { |
| 40 | has_ARB_buffer_storage = false; | ||
| 41 | has_ARB_direct_state_access = false; | ||
| 42 | has_ARB_separate_shader_objects = false; | ||
| 43 | has_ARB_vertex_attrib_binding = false; | ||
| 44 | |||
| 45 | // Create sampler objects | 40 | // Create sampler objects |
| 46 | for (size_t i = 0; i < texture_samplers.size(); ++i) { | 41 | for (size_t i = 0; i < texture_samplers.size(); ++i) { |
| 47 | texture_samplers[i].Create(); | 42 | texture_samplers[i].Create(); |
| @@ -110,8 +105,6 @@ RasterizerOpenGL::RasterizerOpenGL() { | |||
| 110 | glBindBufferBase(GL_UNIFORM_BUFFER, index, buffer.handle); | 105 | glBindBufferBase(GL_UNIFORM_BUFFER, index, buffer.handle); |
| 111 | } | 106 | } |
| 112 | 107 | ||
| 113 | accelerate_draw = AccelDraw::Disabled; | ||
| 114 | |||
| 115 | glEnable(GL_BLEND); | 108 | glEnable(GL_BLEND); |
| 116 | 109 | ||
| 117 | LOG_CRITICAL(Render_OpenGL, "Sync fixed function OpenGL state here!"); | 110 | LOG_CRITICAL(Render_OpenGL, "Sync fixed function OpenGL state here!"); |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index ab06e2d95..e150be58f 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -135,10 +135,10 @@ private: | |||
| 135 | /// Syncs the blend state to match the guest state | 135 | /// Syncs the blend state to match the guest state |
| 136 | void SyncBlendState(); | 136 | void SyncBlendState(); |
| 137 | 137 | ||
| 138 | bool has_ARB_buffer_storage; | 138 | bool has_ARB_buffer_storage = false; |
| 139 | bool has_ARB_direct_state_access; | 139 | bool has_ARB_direct_state_access = false; |
| 140 | bool has_ARB_separate_shader_objects; | 140 | bool has_ARB_separate_shader_objects = false; |
| 141 | bool has_ARB_vertex_attrib_binding; | 141 | bool has_ARB_vertex_attrib_binding = false; |
| 142 | 142 | ||
| 143 | OpenGLState state; | 143 | OpenGLState state; |
| 144 | 144 | ||
| @@ -167,5 +167,5 @@ private: | |||
| 167 | void SetupShaders(u8* buffer_ptr, GLintptr buffer_offset); | 167 | void SetupShaders(u8* buffer_ptr, GLintptr buffer_offset); |
| 168 | 168 | ||
| 169 | enum class AccelDraw { Disabled, Arrays, Indexed }; | 169 | enum class AccelDraw { Disabled, Arrays, Indexed }; |
| 170 | AccelDraw accelerate_draw; | 170 | AccelDraw accelerate_draw = AccelDraw::Disabled; |
| 171 | }; | 171 | }; |