summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-23 01:19:34 +0100
committerbunnei <bunneidev@gmail.com>2018-03-23 01:19:34 +0100
commitc6362543d46de63d276874e79715f05dcdfea8e5 (patch)
treed8f3e8c21baa483157184c93bd5b9d9f9c70e3d4
parentgl_rasterizer: Add a simple passthrough shader in lieu of shader generation. (diff)
downloadyuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar
yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.gz
yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.bz2
yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.lz
yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.xz
yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.tar.zst
yuzu-c6362543d46de63d276874e79715f05dcdfea8e5.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp30
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp10
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() {
glBufferData(GL_UNIFORM_BUFFER, sizeof(VSUniformData), nullptr, GL_STREAM_COPY);
glBindBufferBase(GL_UNIFORM_BUFFER, 1, vs_uniform_buffer.handle);
} else {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
accelerate_draw = AccelDraw::Disabled;
@@ -167,12 +167,12 @@ void RasterizerOpenGL::SetupVertexShader(VSUniformData* ub_ptr, GLintptr buffer_
void RasterizerOpenGL::SetupFragmentShader(FSUniformData* ub_ptr, GLintptr buffer_offset) {
MICROPROFILE_SCOPE(OpenGL_FS);
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) {
if (!has_ARB_separate_shader_objects) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return false;
}
@@ -212,23 +212,23 @@ void RasterizerOpenGL::FlushAndInvalidateRegion(PAddr addr, u32 size) {
bool RasterizerOpenGL::AccelerateDisplayTransfer(const void* config) {
MICROPROFILE_SCOPE(OpenGL_Blits);
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return true;
}
bool RasterizerOpenGL::AccelerateTextureCopy(const void* config) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return true;
}
bool RasterizerOpenGL::AccelerateFill(const void* config) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return true;
}
bool RasterizerOpenGL::AccelerateDisplay(const void* config, PAddr framebuffer_addr,
u32 pixel_stride, ScreenInfo& screen_info) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return true;
}
@@ -290,33 +290,33 @@ void main() {
}
void RasterizerOpenGL::SyncClipEnabled() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncClipCoef() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncCullMode() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncDepthScale() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncDepthOffset() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncBlendEnabled() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncBlendFuncs() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
void RasterizerOpenGL::SyncBlendColor() {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
}
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
static bool FillSurface(const Surface& surface, const u8* fill_data,
const MathUtil::Rectangle<u32>& fill_rect, GLuint draw_fb_handle) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return true;
}
@@ -557,7 +557,7 @@ void CachedSurface::LoadGLBuffer(PAddr load_start, PAddr load_end) {
load_end - load_start);
} else {
if (type == SurfaceType::Texture) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
} else {
morton_to_gl_fns[static_cast<size_t>(pixel_format)](stride, height, &gl_buffer[0], addr,
load_start, load_end);
@@ -1102,7 +1102,7 @@ SurfaceRect_Tuple RasterizerCacheOpenGL::GetSurfaceSubRect(const SurfaceParams&
}
Surface RasterizerCacheOpenGL::GetTextureSurface(const void* config) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return {};
}
@@ -1113,7 +1113,7 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces(
}
Surface RasterizerCacheOpenGL::GetFillSurface(const void* config) {
- UNIMPLEMENTED();
+ ASSERT_MSG(false, "Unimplemented");
return {};
}
@@ -1357,5 +1357,5 @@ void RasterizerCacheOpenGL::UnregisterSurface(const Surface& surface) {
}
void RasterizerCacheOpenGL::UpdatePagesCachedCount(PAddr addr, u64 size, int delta) {
- UNIMPLEMENTED();
+ // ASSERT_MSG(false, "Unimplemented");
}