From cbb4dadd6c3285407c25589ac2f141d26e140f95 Mon Sep 17 00:00:00 2001 From: Lolbot Date: Mon, 17 Jun 2013 22:31:19 +0000 Subject: [PATCH] fixed 4 files out of 2730: - removed 24 CR characters - removed 1 trailing whitespaces - replaced 63 tabs with spaces --- src/gpu/shader.cpp | 6 ++-- src/gpu/texture.cpp | 82 +++++++++++++++++++++---------------------- src/lol/gpu/shader.h | 2 +- src/lol/gpu/texture.h | 20 +++++------ 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/gpu/shader.cpp b/src/gpu/shader.cpp index 70ed34d1..0f09b438 100644 --- a/src/gpu/shader.cpp +++ b/src/gpu/shader.cpp @@ -550,9 +550,9 @@ void Shader::SetUniform(ShaderUniform const &uni, ShaderTexture tex, int index) { #if defined USE_D3D9 || defined _XBOX g_d3ddevice->SetTexture(index, (LPDIRECT3DTEXTURE9)tex.m_flags); - g_d3ddevice->SetSamplerState(index, D3DSAMP_MAGFILTER, tex.m_attrib & 0xff); - g_d3ddevice->SetSamplerState(index, D3DSAMP_MINFILTER, (tex.m_attrib >> 8) & 0xff); - g_d3ddevice->SetSamplerState(index, D3DSAMP_MIPFILTER, (tex.m_attrib >> 16) & 0xff); + g_d3ddevice->SetSamplerState(index, D3DSAMP_MAGFILTER, tex.m_attrib & 0xff); + g_d3ddevice->SetSamplerState(index, D3DSAMP_MINFILTER, (tex.m_attrib >> 8) & 0xff); + g_d3ddevice->SetSamplerState(index, D3DSAMP_MIPFILTER, (tex.m_attrib >> 16) & 0xff); #elif !defined __CELLOS_LV2__ glActiveTexture(GL_TEXTURE0 + index); //glEnable(GL_TEXTURE_2D); diff --git a/src/gpu/texture.cpp b/src/gpu/texture.cpp index 815541dc..12a72914 100644 --- a/src/gpu/texture.cpp +++ b/src/gpu/texture.cpp @@ -46,9 +46,9 @@ class TextureData #if defined USE_D3D9 IDirect3DTexture9 *m_texture; - D3DTEXTUREFILTERTYPE m_mag_filter; - D3DTEXTUREFILTERTYPE m_min_filter; - D3DTEXTUREFILTERTYPE m_mip_filter; + D3DTEXTUREFILTERTYPE m_mag_filter; + D3DTEXTUREFILTERTYPE m_min_filter; + D3DTEXTUREFILTERTYPE m_mip_filter; #elif defined _XBOX D3DTexture *m_texture; #else @@ -173,9 +173,9 @@ ShaderTexture Texture::GetTexture() const ShaderTexture ret; #if defined USE_D3D9 || defined _XBOX ret.m_flags = (uint64_t)(uintptr_t)m_data->m_texture; - ret.m_attrib = m_data->m_mag_filter; - ret.m_attrib |= m_data->m_min_filter << 8; - ret.m_attrib |= m_data->m_mip_filter << 16; + ret.m_attrib = m_data->m_mag_filter; + ret.m_attrib |= m_data->m_min_filter << 8; + ret.m_attrib |= m_data->m_mip_filter << 16; #else ret.m_flags = m_data->m_texture; #endif @@ -240,54 +240,54 @@ void Texture::SetSubData(ivec2 origin, ivec2 size, void *data) void Texture::SetMagFiltering(TextureMagFilter filter) { #if defined _XBOX || defined USE_D3D9 - // In DirectX, texture filtering is a per-texture-unit state - switch (filter) - { - case TextureMagFilter::NEAREST_TEXEL: m_data->m_mag_filter = D3DTEXF_POINT; break; - case TextureMagFilter::LINEAR_TEXEL: m_data->m_mag_filter = D3DTEXF_LINEAR; break; - } + // In DirectX, texture filtering is a per-texture-unit state + switch (filter) + { + case TextureMagFilter::NEAREST_TEXEL: m_data->m_mag_filter = D3DTEXF_POINT; break; + case TextureMagFilter::LINEAR_TEXEL: m_data->m_mag_filter = D3DTEXF_LINEAR; break; + } #else glBindTexture(GL_TEXTURE_2D, m_data->m_texture); - GLenum gl_filter; - switch (filter) - { - case TextureMagFilter::NEAREST_TEXEL: gl_filter = GL_NEAREST; break; - case TextureMagFilter::LINEAR_TEXEL: gl_filter = GL_LINEAR; break; - } - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter); + GLenum gl_filter; + switch (filter) + { + case TextureMagFilter::NEAREST_TEXEL: gl_filter = GL_NEAREST; break; + case TextureMagFilter::LINEAR_TEXEL: gl_filter = GL_LINEAR; break; + } + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter); #endif } void Texture::SetMinFiltering(TextureMinFilter filter) { #if defined _XBOX || defined USE_D3D9 - // In DirectX, texture filtering is a per-texture-unit state + // In DirectX, texture filtering is a per-texture-unit state #define F(x, y) \ - m_data->m_min_filter = x; m_data->m_mip_filter = y; - switch (filter) - { - case TextureMinFilter::NEAREST_TEXEL_NO_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_NONE); break; - case TextureMinFilter::LINEAR_TEXEL_NO_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_NONE); break; - case TextureMinFilter::NEAREST_TEXEL_NEAREST_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_POINT); break; - case TextureMinFilter::LINEAR_TEXEL_NEAREST_MIPMAP: F(D3DTEXF_LINEAR, D3DTEXF_POINT); break; - case TextureMinFilter::NEAREST_TEXEL_LINEAR_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_LINEAR); break; - case TextureMinFilter::LINEAR_TEXEL_LINEAR_MIPMAP: F(D3DTEXF_LINEAR, D3DTEXF_LINEAR); break; - } + m_data->m_min_filter = x; m_data->m_mip_filter = y; + switch (filter) + { + case TextureMinFilter::NEAREST_TEXEL_NO_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_NONE); break; + case TextureMinFilter::LINEAR_TEXEL_NO_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_NONE); break; + case TextureMinFilter::NEAREST_TEXEL_NEAREST_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_POINT); break; + case TextureMinFilter::LINEAR_TEXEL_NEAREST_MIPMAP: F(D3DTEXF_LINEAR, D3DTEXF_POINT); break; + case TextureMinFilter::NEAREST_TEXEL_LINEAR_MIPMAP: F(D3DTEXF_POINT, D3DTEXF_LINEAR); break; + case TextureMinFilter::LINEAR_TEXEL_LINEAR_MIPMAP: F(D3DTEXF_LINEAR, D3DTEXF_LINEAR); break; + } #undef F #else glBindTexture(GL_TEXTURE_2D, m_data->m_texture); - GLenum gl_filter; - switch (filter) - { - case TextureMinFilter::NEAREST_TEXEL_NO_MIPMAP: gl_filter = GL_NEAREST; break; - case TextureMinFilter::LINEAR_TEXEL_NO_MIPMAP: gl_filter = GL_LINEAR; break; - case TextureMinFilter::NEAREST_TEXEL_NEAREST_MIPMAP: gl_filter = GL_NEAREST_MIPMAP_NEAREST; break; - case TextureMinFilter::NEAREST_TEXEL_LINEAR_MIPMAP: gl_filter = GL_NEAREST_MIPMAP_LINEAR; break; - case TextureMinFilter::LINEAR_TEXEL_NEAREST_MIPMAP: gl_filter = GL_LINEAR_MIPMAP_NEAREST; break; - case TextureMinFilter::LINEAR_TEXEL_LINEAR_MIPMAP: gl_filter = GL_LINEAR_MIPMAP_LINEAR; break; - } - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter); + GLenum gl_filter; + switch (filter) + { + case TextureMinFilter::NEAREST_TEXEL_NO_MIPMAP: gl_filter = GL_NEAREST; break; + case TextureMinFilter::LINEAR_TEXEL_NO_MIPMAP: gl_filter = GL_LINEAR; break; + case TextureMinFilter::NEAREST_TEXEL_NEAREST_MIPMAP: gl_filter = GL_NEAREST_MIPMAP_NEAREST; break; + case TextureMinFilter::NEAREST_TEXEL_LINEAR_MIPMAP: gl_filter = GL_NEAREST_MIPMAP_LINEAR; break; + case TextureMinFilter::LINEAR_TEXEL_NEAREST_MIPMAP: gl_filter = GL_LINEAR_MIPMAP_NEAREST; break; + case TextureMinFilter::LINEAR_TEXEL_LINEAR_MIPMAP: gl_filter = GL_LINEAR_MIPMAP_LINEAR; break; + } + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter); #endif } diff --git a/src/lol/gpu/shader.h b/src/lol/gpu/shader.h index 1e2fdff0..5cd2c494 100644 --- a/src/lol/gpu/shader.h +++ b/src/lol/gpu/shader.h @@ -58,7 +58,7 @@ public: private: uint64_t m_flags; #if defined USE_D3D9 || defined _XBOX - uint32_t m_attrib; + uint32_t m_attrib; #endif }; diff --git a/src/lol/gpu/texture.h b/src/lol/gpu/texture.h index 8b142b5f..1ad13e3b 100644 --- a/src/lol/gpu/texture.h +++ b/src/lol/gpu/texture.h @@ -59,8 +59,8 @@ struct TextureMagFilter enum Value { Unknown = 0, - NEAREST_TEXEL, - LINEAR_TEXEL, + NEAREST_TEXEL, + LINEAR_TEXEL, } m_value; @@ -74,12 +74,12 @@ struct TextureMinFilter enum Value { Unknown = 0, - NEAREST_TEXEL_NO_MIPMAP, - LINEAR_TEXEL_NO_MIPMAP, - NEAREST_TEXEL_NEAREST_MIPMAP, - NEAREST_TEXEL_LINEAR_MIPMAP, - LINEAR_TEXEL_NEAREST_MIPMAP, - LINEAR_TEXEL_LINEAR_MIPMAP, + NEAREST_TEXEL_NO_MIPMAP, + LINEAR_TEXEL_NO_MIPMAP, + NEAREST_TEXEL_NEAREST_MIPMAP, + NEAREST_TEXEL_LINEAR_MIPMAP, + LINEAR_TEXEL_NEAREST_MIPMAP, + LINEAR_TEXEL_LINEAR_MIPMAP, } m_value; @@ -98,8 +98,8 @@ public: void SetData(void *data); void SetSubData(ivec2 origin, ivec2 size, void *data); - void SetMagFiltering(TextureMagFilter filter); - void SetMinFiltering(TextureMinFilter filter); + void SetMagFiltering(TextureMagFilter filter); + void SetMinFiltering(TextureMinFilter filter); ShaderTexture GetTexture() const;