MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-06 02:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 60be8ced99 into 4867bb2e2b

Browse source
This commit is contained in:
Wunk 2026-05-31 16:38:39 +08:00 • committed by GitHub
commit d9806a04da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -541,6 +541,8 @@ void RasterizerOpenGL::DrawTriangles() {
bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
MICROPROFILE_SCOPE(OpenGL_Drawing);
const DebugScope scope(runtime, Common::Vec4f{}, "RasterizerOpenGL::Draw");
SyncDrawState();
const bool shadow_rendering = regs.framebuffer.IsShadowRendering();

36
src/video_core/renderer_opengl/gl_texture_runtime.cpp
View file

@ -174,6 +174,11 @@ bool TextureRuntime::Reinterpret(Surface& source, Surface& dest,
const VideoCore::TextureCopy& copy) {
const PixelFormat src_format = source.pixel_format;
const PixelFormat dst_format = dest.pixel_format;
const DebugScope scope(*this, Common::Vec4f{}, "TextureRuntime::Reinterpret ({} -> {})",
VideoCore::PixelFormatAsString(src_format),
VideoCore::PixelFormatAsString(dst_format));
ASSERT_MSG(src_format != dst_format, "Reinterpretation with the same format is invalid");
if (src_format == PixelFormat::D24S8 && dst_format == PixelFormat::RGBA8) {
blit_helper.ConvertDS24S8ToRGBA8(source, dest, copy);
@ -190,6 +195,10 @@ bool TextureRuntime::Reinterpret(Surface& source, Surface& dest,
bool TextureRuntime::ClearTextureWithoutFbo(Surface& surface,
const VideoCore::TextureClear& clear) {
const DebugScope scope(
*this, Common::Vec4f{}, "TextureRuntime::ClearTextureWithoutFbo ({}, {}, {}, {})",
clear.value.color.r(), clear.value.color.g(), clear.value.color.b(), clear.value.color.a());
if (!driver.HasArbClearTexture() || driver.HasBug(DriverBug::BrokenClearTexture)) {
return false;
}
@ -219,6 +228,10 @@ bool TextureRuntime::ClearTextureWithoutFbo(Surface& surface,
}
void TextureRuntime::ClearTexture(Surface& surface, const VideoCore::TextureClear& clear) {
const DebugScope scope(*this, Common::Vec4f{}, "TextureRuntime::ClearTexture ({}, {}, {}, {})",
clear.value.color.r(), clear.value.color.g(), clear.value.color.b(),
clear.value.color.a());
if (ClearTextureWithoutFbo(surface, clear)) {
return;
}
@ -262,6 +275,9 @@ void TextureRuntime::ClearTexture(Surface& surface, const VideoCore::TextureClea
bool TextureRuntime::CopyTextures(Surface& source, Surface& dest,
std::span<const VideoCore::TextureCopy> copies) {
const DebugScope scope(*this, Common::Vec4f{}, "TextureRuntime::CopyTexture ({} copies)",
copies.size());
const GLenum src_textarget = source.texture_type == VideoCore::TextureType::CubeMap
? GL_TEXTURE_CUBE_MAP
: GL_TEXTURE_2D;
@ -279,6 +295,8 @@ bool TextureRuntime::CopyTextures(Surface& source, Surface& dest,
bool TextureRuntime::BlitTextures(Surface& source, Surface& dest,
const VideoCore::TextureBlit& blit) {
const DebugScope scope(*this, Common::Vec4f{}, "TextureRuntime::BlitTextures");
OpenGLState state = OpenGLState::GetCurState();
state.scissor.enabled = false;
state.draw.read_framebuffer = read_fbos[FboIndex(source.type)].handle;
@ -302,6 +320,8 @@ bool TextureRuntime::BlitTextures(Surface& source, Surface& dest,
}
void TextureRuntime::GenerateMipmaps(Surface& surface) {
const DebugScope scope(*this, Common::Vec4f{}, "TextureRuntime::GenerateMipmaps");
OpenGLState state = OpenGLState::GetCurState();
const auto generate = [&](u32 index) {
@ -373,6 +393,8 @@ GLuint Surface::Handle(u32 index) const noexcept {
}
GLuint Surface::CopyHandle() noexcept {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::CopyHandle");
if (!copy_texture.handle) {
copy_texture = MakeHandle(GL_TEXTURE_2D, GetScaledWidth(), GetScaledHeight(), levels, tuple,
DebugName(true));
@ -390,6 +412,8 @@ GLuint Surface::CopyHandle() noexcept {
void Surface::Upload(const VideoCore::BufferTextureCopy& upload,
const VideoCore::StagingData& staging) {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::Upload");
ASSERT(stride * GetFormatBytesPerPixel(pixel_format) % 4 == 0);
const u32 unscaled_width = upload.texture_rect.GetWidth();
@ -417,6 +441,8 @@ void Surface::Upload(const VideoCore::BufferTextureCopy& upload,
}
void Surface::UploadCustom(const VideoCore::Material* material, u32 level) {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::UploadCustom");
const u32 width = material->width;
const u32 height = material->height;
const auto color = material->textures[0];
@ -459,6 +485,8 @@ void Surface::UploadCustom(const VideoCore::Material* material, u32 level) {
void Surface::Download(const VideoCore::BufferTextureCopy& download,
const VideoCore::StagingData& staging) {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::Download");
ASSERT(stride * GetFormatBytesPerPixel(pixel_format) % 4 == 0);
const u32 unscaled_width = download.texture_rect.GetWidth();
@ -498,6 +526,8 @@ void Surface::Download(const VideoCore::BufferTextureCopy& download,
bool Surface::DownloadWithoutFbo(const VideoCore::BufferTextureCopy& download,
const VideoCore::StagingData& staging) {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::DownloadWithoutFbo");
if (driver->IsOpenGLES()) {
return false;
}
@ -557,6 +587,8 @@ void Surface::Attach(GLenum target, u32 level, u32 layer, bool scaled) {
}
void Surface::ScaleUp(u32 new_scale) {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::ScaleUp (NewScale:{})", new_scale);
if (res_scale == new_scale || new_scale == 1) {
return;
}
@ -585,6 +617,8 @@ u32 Surface::GetInternalBytesPerPixel() const {
}
void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
const DebugScope scope(*runtime, Common::Vec4f{}, "Surface::BlitScale (UpScale:{})", up_scale);
const u32 fbo_index = FboIndex(type);
OpenGLState state = OpenGLState::GetCurState();
@ -682,7 +716,7 @@ Sampler::Sampler(TextureRuntime&, VideoCore::SamplerParams params) {
Sampler::~Sampler() = default;
DebugScope::DebugScope(TextureRuntime& runtime, Common::Vec4f, std::string_view label)
: local_scope_depth{global_scope_depth++} {
: local_scope_depth{Settings::values.renderer_debug ? global_scope_depth++ : 0} {
if (!Settings::values.renderer_debug) {
return;
}