ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved create*Sampler functions into TextureRead.

Browse Source
This commit is contained in:
hiker
2015-05-06 22:33:15 +10:00
parent a6b8783d46
commit 08ea768e16
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/shaders.cpp
View File

@@ -531,7 +531,7 @@ void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
}
GLuint XXXcreateNearestSampler()
GLuint createNearestSampler()
{
#ifdef GL_VERSION_3_3
unsigned id;
@@ -631,7 +631,7 @@ void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
}
GLuint XXXcreateTrilinearSampler()
GLuint createTrilinearSampler()
{
#ifdef GL_VERSION_3_3
unsigned id;

10
src/graphics/texture_read.cpp
View File

@@ -70,7 +70,7 @@ void TextureReadBaseNew::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint
} // bindTextureTrilinearAnisotropic
// ----------------------------------------------------------------------------
GLuint createNearestSampler()
GLuint TextureReadBaseNew::createNearestSampler()
{
#ifdef GL_VERSION_3_3
unsigned id;
@@ -98,7 +98,7 @@ void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
} // bindTextureNearesClamped
// ----------------------------------------------------------------------------
void bindTextureBilinear(GLuint texture_unit, GLuint tex)
void TextureReadBaseNew::bindTextureBilinear(GLuint texture_unit, GLuint tex)
{
glActiveTexture(GL_TEXTURE0 + texture_unit);
glBindTexture(GL_TEXTURE_2D, tex);
@@ -110,7 +110,7 @@ void bindTextureBilinear(GLuint texture_unit, GLuint tex)
} // bindTextureBilinear
// ----------------------------------------------------------------------------
void bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
void TextureReadBaseNew::bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
{
glActiveTexture(GL_TEXTURE0 + tex_unit);
glBindTexture(GL_TEXTURE_2D, tex);
@@ -122,7 +122,7 @@ void bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
} // bindTextureBilinearClamped
// ----------------------------------------------------------------------------
void bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
{
glActiveTexture(GL_TEXTURE0 + tex_unit);
glBindTexture(GL_TEXTURE_2D, tex);
@@ -134,7 +134,7 @@ void bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
} // bindTextureSemiTrilinear
// ----------------------------------------------------------------------------
GLuint createTrilinearSampler()
GLuint TextureReadBaseNew::createTrilinearSampler()
{
#ifdef GL_VERSION_3_3
unsigned id;

19
src/graphics/texture_read.hpp
View File

@@ -22,9 +22,6 @@
#include <functional>
GLuint createNearestSampler();
GLuint createTrilinearSampler();
enum SamplerTypeNew {
ST_NEAREST_FILTERED,
@@ -46,16 +43,24 @@ public:
typedef std::function<void(unsigned, unsigned)> BindFunction;
protected:
static void bindTextureNearest(GLuint TU, GLuint tid);
static void bindTextureNearestClamped(GLuint texture_unit, GLuint tex);
static void bindTextureTrilinearAnisotropic(GLuint, GLuint);
static void bindTextureNearest(GLuint tex_unit, GLuint tex_id);
static void bindTextureBilinear(GLuint texture_unit, GLuint tex);
static void bindTextureBilinearClamped(GLuint tex_unit, GLuint tex);
static void bindTextureNearestClamped(GLuint tex_unit, GLuint tex_id);
static void bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex_id);
static void bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id);
GLuint createSamplers(SamplerTypeNew sampler_type);
private:
static GLuint createNearestSampler();
static GLuint createTrilinearSampler();
protected:
static BindFunction m_all_bind_functions[2];
std::vector<BindFunction> m_bind_functions;
static GLuint m_all_texture_types[];
GLuint createSamplers(SamplerTypeNew);
}; // TextureReadBaseNew
// ============================================================================