From 36cd5bbf210e28f972d851fe1adaff034937abb7 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Fri, 19 Jan 2018 05:06:42 +0100 Subject: [PATCH] gs-sampler: Add wrapper for gs_samplerstate_t Simple manager with automatic updating whenever the object is requested. --- CMakeLists.txt | 2 + source/gs-sampler.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++ source/gs-sampler.h | 64 +++++++++++++++++++++++ 3 files changed, 181 insertions(+) create mode 100644 source/gs-sampler.cpp create mode 100644 source/gs-sampler.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ebc5edcf..3474f7c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ SET(obs-stream-effects_HEADERS "${PROJECT_SOURCE_DIR}/source/gs-limits.h" # "${PROJECT_SOURCE_DIR}/source/gs-mipmapper.h" "${PROJECT_SOURCE_DIR}/source/gs-rendertarget.h" + "${PROJECT_SOURCE_DIR}/source/gs-sampler.h" "${PROJECT_SOURCE_DIR}/source/gs-texture.h" "${PROJECT_SOURCE_DIR}/source/gs-vertex.h" "${PROJECT_SOURCE_DIR}/source/gs-vertexbuffer.h" @@ -63,6 +64,7 @@ SET(obs-stream-effects_SOURCES "${PROJECT_SOURCE_DIR}/source/gs-indexbuffer.cpp" # "${PROJECT_SOURCE_DIR}/source/gs-mipmapper.cpp" "${PROJECT_SOURCE_DIR}/source/gs-rendertarget.cpp" + "${PROJECT_SOURCE_DIR}/source/gs-sampler.cpp" "${PROJECT_SOURCE_DIR}/source/gs-texture.cpp" "${PROJECT_SOURCE_DIR}/source/gs-vertex.cpp" "${PROJECT_SOURCE_DIR}/source/gs-vertexbuffer.cpp" diff --git a/source/gs-sampler.cpp b/source/gs-sampler.cpp new file mode 100644 index 00000000..8880d915 --- /dev/null +++ b/source/gs-sampler.cpp @@ -0,0 +1,115 @@ +/* + * Modern effects for a modern Streamer + * Copyright (C) 2017 Michael Fabian Dirks + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "gs-sampler.h" + +GS::Sampler::Sampler() { + m_dirty = true; + m_samplerInfo = { GS_FILTER_LINEAR, GS_ADDRESS_WRAP, GS_ADDRESS_WRAP, GS_ADDRESS_WRAP, 1, 0 }; + m_samplerState = nullptr; +} + +GS::Sampler::~Sampler() { + if (m_samplerState) + gs_samplerstate_destroy(m_samplerState); +} + +void GS::Sampler::SetSampleFilter(gs_sample_filter v) { + m_dirty = true; + m_samplerInfo.filter = v; +} + +gs_sample_filter GS::Sampler::GetSampleFilter() { + return m_samplerInfo.filter; +} + +void GS::Sampler::SetAddressModeU(gs_address_mode v) { + m_dirty = true; + m_samplerInfo.address_u = v; +} + +gs_address_mode GS::Sampler::GetAddressModeU() { + return m_samplerInfo.address_u; +} + +void GS::Sampler::SetAddressModeV(gs_address_mode v) { + m_dirty = true; + m_samplerInfo.address_v = v; +} + +gs_address_mode GS::Sampler::GetAddressModeV() { + return m_samplerInfo.address_v; +} + +void GS::Sampler::SetAddressModeW(gs_address_mode v) { + m_dirty = true; + m_samplerInfo.address_w = v; +} + +gs_address_mode GS::Sampler::GetAddressModeW() { + return m_samplerInfo.address_w; +} + +void GS::Sampler::SetMaxAnisotropy(int v) { + m_dirty = true; + m_samplerInfo.max_anisotropy = v; +} + +int GS::Sampler::GetMaxAnisotropy() { + return m_samplerInfo.max_anisotropy; +} + +void GS::Sampler::SetBorderColor(uint32_t v) { + m_dirty = true; + m_samplerInfo.border_color = v; +} + +void GS::Sampler::SetBorderColor(uint8_t r, uint8_t g, uint8_t b, uint8_t a) { + m_dirty = true; + m_samplerInfo.border_color = a << 24 | r << 16 | g << 8 | b; +} + +uint32_t GS::Sampler::GetBorderColor() { + return m_samplerInfo.border_color; +} + +uint8_t GS::Sampler::GetBorderColor(bool r, bool g, bool b, bool a) { + if (a) + return (m_samplerInfo.border_color >> 24) & 0xFF; + if (r) + return (m_samplerInfo.border_color >> 16) & 0xFF; + if (g) + return (m_samplerInfo.border_color >> 8) & 0xFF; + if (b) + return m_samplerInfo.border_color & 0xFF; + return 0; +} + +gs_sampler_state* GS::Sampler::Refresh() { + gs_samplerstate_destroy(m_samplerState); + m_samplerState = gs_samplerstate_create(&m_samplerInfo); + m_dirty = false; + return m_samplerState; +} + +gs_sampler_state* GS::Sampler::GetObject() { + if (m_dirty) + return Refresh(); + return m_samplerState; +} diff --git a/source/gs-sampler.h b/source/gs-sampler.h new file mode 100644 index 00000000..ac7bcfa7 --- /dev/null +++ b/source/gs-sampler.h @@ -0,0 +1,64 @@ +/* + * Modern effects for a modern Streamer + * Copyright (C) 2017 Michael Fabian Dirks + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma once +#include +extern "C" { + #pragma warning( push ) + #pragma warning( disable: 4201 ) + #include + #pragma warning( pop ) +} + +namespace GS { + class Sampler { + public: + Sampler(); + ~Sampler(); + + void SetSampleFilter(gs_sample_filter v); + gs_sample_filter GetSampleFilter(); + + void SetAddressModeU(gs_address_mode v); + gs_address_mode GetAddressModeU(); + + void SetAddressModeV(gs_address_mode v); + gs_address_mode GetAddressModeV(); + + void SetAddressModeW(gs_address_mode v); + gs_address_mode GetAddressModeW(); + + void SetMaxAnisotropy(int v); + int GetMaxAnisotropy(); + + void SetBorderColor(uint32_t v); + void SetBorderColor(uint8_t r, uint8_t g, uint8_t b, uint8_t a); + uint32_t GetBorderColor(); + uint8_t GetBorderColor(bool r, bool g, bool b, bool a); + + gs_sampler_state* Refresh(); + + gs_sampler_state* GetObject(); + + private: + bool m_dirty; + gs_sampler_info m_samplerInfo; + gs_sampler_state* m_samplerState; + }; +}