mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-12 01:38:37 +12:00
gl: Reimplement textures
- Separate texture data from texture views
This commit is contained in:
kd-11
kd-11
parent
cf1b700ebc
commit
6d46ac1ad6
12 changed files with 589 additions and 1162 deletions
|
|
@ -306,279 +306,6 @@ namespace gl
|
|||
return m_size;
|
||||
}
|
||||
|
||||
void texture::settings::apply(const texture &texture) const
|
||||
{
|
||||
save_binding_state save(texture);
|
||||
|
||||
texture.pixel_unpack_settings().apply();
|
||||
|
||||
if (compressed_format(m_internal_format))
|
||||
{
|
||||
int compressed_image_size = m_compressed_image_size;
|
||||
if (!compressed_image_size)
|
||||
{
|
||||
switch (m_internal_format)
|
||||
{
|
||||
case texture::internal_format::compressed_rgb_s3tc_dxt1:
|
||||
compressed_image_size = ((m_width + 2) / 3) * ((m_height + 2) / 3) * 6;
|
||||
break;
|
||||
|
||||
case texture::internal_format::compressed_rgba_s3tc_dxt1:
|
||||
compressed_image_size = ((m_width + 3) / 4) * ((m_height + 3) / 4) * 8;
|
||||
break;
|
||||
|
||||
case texture::internal_format::compressed_rgba_s3tc_dxt3:
|
||||
case texture::internal_format::compressed_rgba_s3tc_dxt5:
|
||||
compressed_image_size = ((m_width + 3) / 4) * ((m_height + 3) / 4) * 16;
|
||||
break;
|
||||
default:
|
||||
fmt::throw_exception("Tried to load unimplemented internal_format type." HERE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_parent->get_target() != gl::texture::target::texture2D)
|
||||
fmt::throw_exception("Mutable compressed texture of non-2D type is unimplemented" HERE);
|
||||
|
||||
glCompressedTexImage2D((GLenum)m_parent->get_target(), m_level, (GLint)m_internal_format, m_width, m_height, 0, compressed_image_size, m_pixels);
|
||||
}
|
||||
else
|
||||
{
|
||||
switch ((GLenum)m_parent->get_target())
|
||||
{
|
||||
case GL_TEXTURE_1D:
|
||||
{
|
||||
glTexImage1D(GL_TEXTURE_1D, m_level, (GLint)m_internal_format, m_width, 0, (GLint)m_format, (GLint)m_type, m_pixels);
|
||||
break;
|
||||
}
|
||||
case GL_TEXTURE_2D:
|
||||
{
|
||||
glTexImage2D(GL_TEXTURE_2D, m_level, (GLint)m_internal_format, m_width, m_height, 0, (GLint)m_format, (GLint)m_type, m_pixels);
|
||||
break;
|
||||
}
|
||||
case GL_TEXTURE_3D:
|
||||
{
|
||||
glTexImage3D(GL_TEXTURE_3D, m_level, (GLint)m_internal_format, m_width, m_height, m_depth, 0, (GLint)m_format, (GLint)m_type, m_pixels);
|
||||
break;
|
||||
}
|
||||
case GL_TEXTURE_CUBE_MAP:
|
||||
{
|
||||
for (int face = 0; face < 6; ++face)
|
||||
glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, m_level, (GLint)m_internal_format, m_width, m_height, 0, (GLint)m_format, (GLint)m_type, m_pixels);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_MAX_LEVEL, m_max_level);
|
||||
|
||||
if (m_pixels && m_generate_mipmap)
|
||||
{
|
||||
glGenerateMipmap((GLenum)m_parent->get_target());
|
||||
}
|
||||
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_WRAP_S, (GLint)m_wrap_s);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_WRAP_T, (GLint)m_wrap_t);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_WRAP_R, (GLint)m_wrap_r);
|
||||
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_COMPARE_MODE, (GLint)m_compare_mode);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_COMPARE_FUNC, (GLint)m_compare_func);
|
||||
|
||||
glTexParameterf((GLenum)m_parent->get_target(), GL_TEXTURE_MIN_LOD, m_max_lod);
|
||||
glTexParameterf((GLenum)m_parent->get_target(), GL_TEXTURE_MAX_LOD, m_min_lod);
|
||||
glTexParameterf((GLenum)m_parent->get_target(), GL_TEXTURE_LOD_BIAS, m_lod);
|
||||
|
||||
glTexParameterfv((GLenum)m_parent->get_target(), GL_TEXTURE_BORDER_COLOR, m_border_color.rgba);
|
||||
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_MIN_FILTER, (GLint)m_min_filter);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_MAG_FILTER, (GLint)m_mag_filter);
|
||||
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_SWIZZLE_R, (GLint)m_swizzle_r);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_SWIZZLE_G, (GLint)m_swizzle_g);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_SWIZZLE_B, (GLint)m_swizzle_b);
|
||||
glTexParameteri((GLenum)m_parent->get_target(), GL_TEXTURE_SWIZZLE_A, (GLint)m_swizzle_a);
|
||||
|
||||
glTexParameterf((GLenum)m_parent->get_target(), GL_TEXTURE_MAX_ANISOTROPY_EXT, m_aniso);
|
||||
}
|
||||
|
||||
void texture::settings::apply()
|
||||
{
|
||||
if (m_parent)
|
||||
{
|
||||
apply(*m_parent);
|
||||
m_parent = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::swizzle(texture::channel r, texture::channel g, texture::channel b, texture::channel a)
|
||||
{
|
||||
m_swizzle_r = r;
|
||||
m_swizzle_g = g;
|
||||
m_swizzle_b = b;
|
||||
m_swizzle_a = a;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::format(texture::format format)
|
||||
{
|
||||
m_format = format;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::type(texture::type type)
|
||||
{
|
||||
m_type = type;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::internal_format(texture::internal_format format)
|
||||
{
|
||||
m_internal_format = format;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::filter(min_filter min_filter, gl::filter mag_filter)
|
||||
{
|
||||
m_min_filter = min_filter;
|
||||
m_mag_filter = mag_filter;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::width(uint width)
|
||||
{
|
||||
m_width = width;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::height(uint height)
|
||||
{
|
||||
m_height = height;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::depth(uint depth)
|
||||
{
|
||||
m_depth = depth;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::size(sizei size)
|
||||
{
|
||||
return width(size.width).height(size.height);
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::level(int value)
|
||||
{
|
||||
m_level = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::compressed_image_size(int size)
|
||||
{
|
||||
m_compressed_image_size = size;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::pixels(const void* pixels)
|
||||
{
|
||||
m_pixels = pixels;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::aniso(float value)
|
||||
{
|
||||
m_aniso = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::compare_mode(texture::compare_mode value)
|
||||
{
|
||||
m_compare_mode = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::compare_func(texture::compare_func value)
|
||||
{
|
||||
m_compare_func = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::compare(texture::compare_func func, texture::compare_mode mode)
|
||||
{
|
||||
return compare_func(func).compare_mode(mode);
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::wrap_s(texture::wrap value)
|
||||
{
|
||||
m_wrap_s = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::wrap_t(texture::wrap value)
|
||||
{
|
||||
m_wrap_t = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::wrap_r(texture::wrap value)
|
||||
{
|
||||
m_wrap_r = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::wrap(texture::wrap s, texture::wrap t, texture::wrap r)
|
||||
{
|
||||
return wrap_s(s).wrap_t(t).wrap_r(r);
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::max_lod(float value)
|
||||
{
|
||||
m_max_lod = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::min_lod(float value)
|
||||
{
|
||||
m_min_lod = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::lod(float value)
|
||||
{
|
||||
m_lod = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::max_level(int value)
|
||||
{
|
||||
m_max_level = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::generate_mipmap(bool value)
|
||||
{
|
||||
m_generate_mipmap = value;
|
||||
return *this;
|
||||
}
|
||||
texture::settings& texture::settings::mipmap(int level, int max_level, float lod, float min_lod, float max_lod, bool generate)
|
||||
{
|
||||
return this->level(level).max_level(max_level).lod(lod).min_lod(min_lod).max_lod(max_lod).generate_mipmap(generate);
|
||||
}
|
||||
|
||||
texture::settings& texture::settings::border_color(color4f value)
|
||||
{
|
||||
m_border_color = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
texture_view texture::with_level(int level)
|
||||
{
|
||||
return{ get_target(), id() };
|
||||
}
|
||||
|
||||
texture::settings texture::config()
|
||||
{
|
||||
return{ this };
|
||||
}
|
||||
|
||||
void texture::config(const settings& settings_)
|
||||
{
|
||||
settings_.apply(*this);
|
||||
}
|
||||
|
||||
bool is_primitive_native(rsx::primitive_type in)
|
||||
{
|
||||
switch (in)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue