diff options
| author | 2018-03-22 20:19:34 -0400 | |
|---|---|---|
| committer | 2018-03-22 20:19:34 -0400 | |
| commit | c6362543d46de63d276874e79715f05dcdfea8e5 (patch) | |
| tree | d8f3e8c21baa483157184c93bd5b9d9f9c70e3d4 /src | |
| parent | gl_rasterizer: Add a simple passthrough shader in lieu of shader generation. (diff) | |
| download | yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.gz yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.xz yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.zip | |
gl_rasterizer: Replace a bunch of UNIMPLEMENTED with ASSERT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 30 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 10 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 8b08de011..0aed4b048 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -120,7 +120,7 @@ RasterizerOpenGL::RasterizerOpenGL() { | |||
| 120 | glBufferData(GL_UNIFORM_BUFFER, sizeof(VSUniformData), nullptr, GL_STREAM_COPY); | 120 | glBufferData(GL_UNIFORM_BUFFER, sizeof(VSUniformData), nullptr, GL_STREAM_COPY); |
| 121 | glBindBufferBase(GL_UNIFORM_BUFFER, 1, vs_uniform_buffer.handle); | 121 | glBindBufferBase(GL_UNIFORM_BUFFER, 1, vs_uniform_buffer.handle); |
| 122 | } else { | 122 | } else { |
| 123 | UNIMPLEMENTED(); | 123 | ASSERT_MSG(false, "Unimplemented"); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | accelerate_draw = AccelDraw::Disabled; | 126 | accelerate_draw = AccelDraw::Disabled; |
| @@ -167,12 +167,12 @@ void RasterizerOpenGL::SetupVertexShader(VSUniformData* ub_ptr, GLintptr buffer_ | |||
| 167 | 167 | ||
| 168 | void RasterizerOpenGL::SetupFragmentShader(FSUniformData* ub_ptr, GLintptr buffer_offset) { | 168 | void RasterizerOpenGL::SetupFragmentShader(FSUniformData* ub_ptr, GLintptr buffer_offset) { |
| 169 | MICROPROFILE_SCOPE(OpenGL_FS); | 169 | MICROPROFILE_SCOPE(OpenGL_FS); |
| 170 | UNIMPLEMENTED(); | 170 | ASSERT_MSG(false, "Unimplemented"); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) { | 173 | bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) { |
| 174 | if (!has_ARB_separate_shader_objects) { | 174 | if (!has_ARB_separate_shader_objects) { |
| 175 | UNIMPLEMENTED(); | 175 | ASSERT_MSG(false, "Unimplemented"); |
| 176 | return false; | 176 | return false; |
| 177 | } | 177 | } |
| 178 | 178 | ||
| @@ -212,23 +212,23 @@ void RasterizerOpenGL::FlushAndInvalidateRegion(PAddr addr, u32 size) { | |||
| 212 | 212 | ||
| 213 | bool RasterizerOpenGL::AccelerateDisplayTransfer(const void* config) { | 213 | bool RasterizerOpenGL::AccelerateDisplayTransfer(const void* config) { |
| 214 | MICROPROFILE_SCOPE(OpenGL_Blits); | 214 | MICROPROFILE_SCOPE(OpenGL_Blits); |
| 215 | UNIMPLEMENTED(); | 215 | ASSERT_MSG(false, "Unimplemented"); |
| 216 | return true; | 216 | return true; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | bool RasterizerOpenGL::AccelerateTextureCopy(const void* config) { | 219 | bool RasterizerOpenGL::AccelerateTextureCopy(const void* config) { |
| 220 | UNIMPLEMENTED(); | 220 | ASSERT_MSG(false, "Unimplemented"); |
| 221 | return true; | 221 | return true; |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | bool RasterizerOpenGL::AccelerateFill(const void* config) { | 224 | bool RasterizerOpenGL::AccelerateFill(const void* config) { |
| 225 | UNIMPLEMENTED(); | 225 | ASSERT_MSG(false, "Unimplemented"); |
| 226 | return true; | 226 | return true; |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | bool RasterizerOpenGL::AccelerateDisplay(const void* config, PAddr framebuffer_addr, | 229 | bool RasterizerOpenGL::AccelerateDisplay(const void* config, PAddr framebuffer_addr, |
| 230 | u32 pixel_stride, ScreenInfo& screen_info) { | 230 | u32 pixel_stride, ScreenInfo& screen_info) { |
| 231 | UNIMPLEMENTED(); | 231 | ASSERT_MSG(false, "Unimplemented"); |
| 232 | return true; | 232 | return true; |
| 233 | } | 233 | } |
| 234 | 234 | ||
| @@ -290,33 +290,33 @@ void main() { | |||
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | void RasterizerOpenGL::SyncClipEnabled() { | 292 | void RasterizerOpenGL::SyncClipEnabled() { |
| 293 | UNIMPLEMENTED(); | 293 | ASSERT_MSG(false, "Unimplemented"); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | void RasterizerOpenGL::SyncClipCoef() { | 296 | void RasterizerOpenGL::SyncClipCoef() { |
| 297 | UNIMPLEMENTED(); | 297 | ASSERT_MSG(false, "Unimplemented"); |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | void RasterizerOpenGL::SyncCullMode() { | 300 | void RasterizerOpenGL::SyncCullMode() { |
| 301 | UNIMPLEMENTED(); | 301 | ASSERT_MSG(false, "Unimplemented"); |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | void RasterizerOpenGL::SyncDepthScale() { | 304 | void RasterizerOpenGL::SyncDepthScale() { |
| 305 | UNIMPLEMENTED(); | 305 | ASSERT_MSG(false, "Unimplemented"); |
| 306 | } | 306 | } |
| 307 | 307 | ||
| 308 | void RasterizerOpenGL::SyncDepthOffset() { | 308 | void RasterizerOpenGL::SyncDepthOffset() { |
| 309 | UNIMPLEMENTED(); | 309 | ASSERT_MSG(false, "Unimplemented"); |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | void RasterizerOpenGL::SyncBlendEnabled() { | 312 | void RasterizerOpenGL::SyncBlendEnabled() { |
| 313 | UNIMPLEMENTED(); | 313 | ASSERT_MSG(false, "Unimplemented"); |
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | void RasterizerOpenGL::SyncBlendFuncs() { | 316 | void RasterizerOpenGL::SyncBlendFuncs() { |
| 317 | UNIMPLEMENTED(); | 317 | ASSERT_MSG(false, "Unimplemented"); |
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | void RasterizerOpenGL::SyncBlendColor() { | 320 | void RasterizerOpenGL::SyncBlendColor() { |
| 321 | UNIMPLEMENTED(); | 321 | ASSERT_MSG(false, "Unimplemented"); |
| 322 | } | 322 | } |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 884637ca5..939391639 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |||
| @@ -290,7 +290,7 @@ static bool BlitTextures(GLuint src_tex, const MathUtil::Rectangle<u32>& src_rec | |||
| 290 | 290 | ||
| 291 | static bool FillSurface(const Surface& surface, const u8* fill_data, | 291 | static bool FillSurface(const Surface& surface, const u8* fill_data, |
| 292 | const MathUtil::Rectangle<u32>& fill_rect, GLuint draw_fb_handle) { | 292 | const MathUtil::Rectangle<u32>& fill_rect, GLuint draw_fb_handle) { |
| 293 | UNIMPLEMENTED(); | 293 | ASSERT_MSG(false, "Unimplemented"); |
| 294 | return true; | 294 | return true; |
| 295 | } | 295 | } |
| 296 | 296 | ||
| @@ -557,7 +557,7 @@ void CachedSurface::LoadGLBuffer(PAddr load_start, PAddr load_end) { | |||
| 557 | load_end - load_start); | 557 | load_end - load_start); |
| 558 | } else { | 558 | } else { |
| 559 | if (type == SurfaceType::Texture) { | 559 | if (type == SurfaceType::Texture) { |
| 560 | UNIMPLEMENTED(); | 560 | ASSERT_MSG(false, "Unimplemented"); |
| 561 | } else { | 561 | } else { |
| 562 | morton_to_gl_fns[static_cast<size_t>(pixel_format)](stride, height, &gl_buffer[0], addr, | 562 | morton_to_gl_fns[static_cast<size_t>(pixel_format)](stride, height, &gl_buffer[0], addr, |
| 563 | load_start, load_end); | 563 | load_start, load_end); |
| @@ -1102,7 +1102,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetSurfaceSubRect(const SurfaceParams& | |||
| 1102 | } | 1102 | } |
| 1103 | 1103 | ||
| 1104 | Surface RasterizerCacheOpenGL::GetTextureSurface(const void* config) { | 1104 | Surface RasterizerCacheOpenGL::GetTextureSurface(const void* config) { |
| 1105 | UNIMPLEMENTED(); | 1105 | ASSERT_MSG(false, "Unimplemented"); |
| 1106 | return {}; | 1106 | return {}; |
| 1107 | } | 1107 | } |
| 1108 | 1108 | ||
| @@ -1113,7 +1113,7 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces( | |||
| 1113 | } | 1113 | } |
| 1114 | 1114 | ||
| 1115 | Surface RasterizerCacheOpenGL::GetFillSurface(const void* config) { | 1115 | Surface RasterizerCacheOpenGL::GetFillSurface(const void* config) { |
| 1116 | UNIMPLEMENTED(); | 1116 | ASSERT_MSG(false, "Unimplemented"); |
| 1117 | return {}; | 1117 | return {}; |
| 1118 | } | 1118 | } |
| 1119 | 1119 | ||
| @@ -1357,5 +1357,5 @@ void RasterizerCacheOpenGL::UnregisterSurface(const Surface& surface) { | |||
| 1357 | } | 1357 | } |
| 1358 | 1358 | ||
| 1359 | void RasterizerCacheOpenGL::UpdatePagesCachedCount(PAddr addr, u64 size, int delta) { | 1359 | void RasterizerCacheOpenGL::UpdatePagesCachedCount(PAddr addr, u64 size, int delta) { |
| 1360 | UNIMPLEMENTED(); | 1360 | // ASSERT_MSG(false, "Unimplemented"); |
| 1361 | } | 1361 | } |