From 72d15bad31a5fd36af382d9e4ffe8e776d52a086 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Thu, 27 Sep 2018 06:21:39 +0200 Subject: [PATCH] gs-mipmapper: Slight formatting changes --- source/gs-mipmapper.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/source/gs-mipmapper.cpp b/source/gs-mipmapper.cpp index cb9e8b6b..6e85bf37 100644 --- a/source/gs-mipmapper.cpp +++ b/source/gs-mipmapper.cpp @@ -161,10 +161,15 @@ void gs::mipmapper::rebuild(std::shared_ptr texture, gs_load_vertexbuffer(vertexBuffer->update()); gs_load_indexbuffer(nullptr); + if (texture->get_type() == gs::texture::type::Normal) { + size_t texture_width = texture->get_width(); + size_t texture_height = texture->get_height(); + float_t texel_width = 1.0 / texture_width; + float_t texel_height = 1.0 / texture_height; + #if defined(WIN32) || defined(WIN64) - if (device_type == GS_DEVICE_DIRECT3D_11) { - // We definitely have a Direct3D11 resource. - if (texture->get_type() == gs::texture::type::Normal) { + if (device_type == GS_DEVICE_DIRECT3D_11) { + // We definitely have a Direct3D11 resource. D3D11_TEXTURE2D_DESC t2dsc; ID3D11Texture2D* t2 = reinterpret_cast(obj); @@ -176,14 +181,11 @@ void gs::mipmapper::rebuild(std::shared_ptr texture, return; } - size_t texture_width = texture->get_width(); - size_t texture_height = texture->get_height(); - float_t texel_width = 1.0 / texture_width; - float_t texel_height = 1.0 / texture_height; - for (size_t mip = 1; mip < t2dsc.MipLevels; mip++) { texture_width /= 2; texture_height /= 2; + texel_width *= 2; + texel_height *= 2; // Draw mipmap layer { @@ -204,10 +206,10 @@ void gs::mipmapper::rebuild(std::shared_ptr texture, dev->context->CopySubresourceRegion(t2, mip, 0, 0, 0, rt, 0, nullptr); } } - } #endif - if (device_type == GS_DEVICE_OPENGL) { - // This is an OpenGL resource. + if (device_type == GS_DEVICE_OPENGL) { + // This is an OpenGL resource. + } } gs_load_indexbuffer(nullptr);