archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

OpenGL renderer: check for gl errors in release builds.

Browse source 
Ignore null-sized textures
Cleanup
This commit is contained in:
DHrpcs3 2016-06-21 01:27:14 +03:00
parent e83c387ebe
commit 8fd3064905
3 changed files with 45 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

38
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View file

@ -685,42 +685,14 @@ bool GLGSRender::load_program()
m_uniform_ring_buffer.unmap(); m_uniform_ring_buffer.unmap();
/*
{
m_uniform_ring_buffer.bind();
auto buffer_range = m_uniform_ring_buffer.allocate(
align(sizeof(glsl_matrix_buffer), m_uniform_buffer_offset_align) +
align(sizeof(glsl_vertex_constants_buffer), m_uniform_buffer_offset_align));
gl::allocator allocator{ m_uniform_ring_buffer, buffer_range };
matrix_buffer_range = allocator.allocate(sizeof(glsl_matrix_buffer), m_uniform_buffer_offset_align);
vertex_constants_buffer_range = allocator.allocate(sizeof(glsl_vertex_constants_buffer), m_uniform_buffer_offset_align);
glsl_matrix_buffer *buffer = allocator.get<glsl_matrix_buffer>(matrix_buffer_range);
fill_scale_offset_data(buffer, false);
fill_matrix_buffer(buffer);
fill_vertex_program_constants_data(allocator.get<glsl_vertex_constants_buffer>(vertex_constants_buffer_range));
if (contains_fragment_constants)
{
//fragment_constants_buffer_range = allocator.allocate(info.fragment_shader.decompiled->constants.size() * sizeof(f32) * 4);
}
}
if (contains_fragment_constants)
{
//m_uniform_ring_buffer.bind_range(2, fragment_constants_buffer_range);
}
*/
m_uniform_ring_buffer.bind_range(0, scale_offset_offset, sizeof(glsl_matrix_buffer)); m_uniform_ring_buffer.bind_range(0, scale_offset_offset, sizeof(glsl_matrix_buffer));
m_uniform_ring_buffer.bind_range(1, vertex_constants_offset, sizeof(glsl_vertex_constants_buffer)); m_uniform_ring_buffer.bind_range(1, vertex_constants_offset, sizeof(glsl_vertex_constants_buffer));
m_uniform_ring_buffer.bind_range(2, fragment_constants_offset, fragment_constants_size);
__glcheck 0; if (fragment_constants_size)
{
m_uniform_ring_buffer.bind_range(2, fragment_constants_offset, fragment_constants_size);
}
return true; return true;
} }

2
rpcs3/Emu/RSX/GL/gl_helpers.h
View file

@ -14,7 +14,7 @@
namespace gl namespace gl
{ {
#ifdef _DEBUG #if 1//def _DEBUG
struct __glcheck_impl_t struct __glcheck_impl_t
{ {
const char* file; const char* file;

54
rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp
View file

@ -296,14 +296,14 @@ namespace rsx
int mip_level = 0; int mip_level = 0;
if (dim == rsx::texture_dimension_extended::texture_dimension_1d) if (dim == rsx::texture_dimension_extended::texture_dimension_1d)
{ {
glTexStorage1D(GL_TEXTURE_1D, mipmap_count, get_sized_internal_format(format), width); __glcheck glTexStorage1D(GL_TEXTURE_1D, mipmap_count, get_sized_internal_format(format), width);
if (!is_compressed_format(format)) if (!is_compressed_format(format))
{ {
const auto &format_type = get_format_type(format); const auto &format_type = get_format_type(format);
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4); __glcheck upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4);
glTexSubImage1D(GL_TEXTURE_1D, mip_level++, 0, layout.width_in_block, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data()); __glcheck glTexSubImage1D(GL_TEXTURE_1D, mip_level++, 0, layout.width_in_block, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data());
} }
} }
else else
@ -311,7 +311,7 @@ namespace rsx
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
u32 size = layout.width_in_block * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16); u32 size = layout.width_in_block * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16);
glCompressedTexSubImage1D(GL_TEXTURE_1D, mip_level++, 0, layout.width_in_block * 4, get_sized_internal_format(format), size, layout.data.data()); __glcheck glCompressedTexSubImage1D(GL_TEXTURE_1D, mip_level++, 0, layout.width_in_block * 4, get_sized_internal_format(format), size, layout.data.data());
} }
} }
return; return;
@ -319,14 +319,14 @@ namespace rsx
if (dim == rsx::texture_dimension_extended::texture_dimension_2d) if (dim == rsx::texture_dimension_extended::texture_dimension_2d)
{ {
glTexStorage2D(GL_TEXTURE_2D, mipmap_count, get_sized_internal_format(format), width, height); __glcheck glTexStorage2D(GL_TEXTURE_2D, mipmap_count, get_sized_internal_format(format), width, height);
if (!is_compressed_format(format)) if (!is_compressed_format(format))
{ {
const auto &format_type = get_format_type(format); const auto &format_type = get_format_type(format);
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4); __glcheck upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4);
glTexSubImage2D(GL_TEXTURE_2D, mip_level++, 0, 0, layout.width_in_block, layout.height_in_block, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data()); __glcheck glTexSubImage2D(GL_TEXTURE_2D, mip_level++, 0, 0, layout.width_in_block, layout.height_in_block, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data());
} }
} }
else else
@ -334,7 +334,7 @@ namespace rsx
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
u32 size = layout.width_in_block * layout.height_in_block * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16); u32 size = layout.width_in_block * layout.height_in_block * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16);
glCompressedTexSubImage2D(GL_TEXTURE_2D, mip_level++, 0, 0, layout.width_in_block * 4, layout.height_in_block * 4, get_sized_internal_format(format), size, layout.data.data()); __glcheck glCompressedTexSubImage2D(GL_TEXTURE_2D, mip_level++, 0, 0, layout.width_in_block * 4, layout.height_in_block * 4, get_sized_internal_format(format), size, layout.data.data());
} }
} }
return; return;
@ -342,7 +342,7 @@ namespace rsx
if (dim == rsx::texture_dimension_extended::texture_dimension_cubemap) if (dim == rsx::texture_dimension_extended::texture_dimension_cubemap)
{ {
glTexStorage2D(GL_TEXTURE_CUBE_MAP, mipmap_count, get_sized_internal_format(format), width, height); __glcheck glTexStorage2D(GL_TEXTURE_CUBE_MAP, mipmap_count, get_sized_internal_format(format), width, height);
// Note : input_layouts size is get_exact_mipmap_count() for non cubemap texture, and 6 * get_exact_mipmap_count() for cubemap // Note : input_layouts size is get_exact_mipmap_count() for non cubemap texture, and 6 * get_exact_mipmap_count() for cubemap
// Thus for non cubemap texture, mip_level / mipmap_per_layer will always be rounded to 0. // Thus for non cubemap texture, mip_level / mipmap_per_layer will always be rounded to 0.
// mip_level % mipmap_per_layer will always be equal to mip_level // mip_level % mipmap_per_layer will always be equal to mip_level
@ -352,7 +352,7 @@ namespace rsx
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4); upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4);
glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + mip_level / mipmap_count, mip_level % mipmap_count, 0, 0, layout.width_in_block, layout.height_in_block, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data()); __glcheck glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + mip_level / mipmap_count, mip_level % mipmap_count, 0, 0, layout.width_in_block, layout.height_in_block, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data());
mip_level++; mip_level++;
} }
} }
@ -361,7 +361,7 @@ namespace rsx
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
u32 size = layout.width_in_block * layout.height_in_block * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16); u32 size = layout.width_in_block * layout.height_in_block * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16);
glCompressedTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + mip_level / mipmap_count, mip_level % mipmap_count, 0, 0, layout.width_in_block * 4, layout.height_in_block * 4, get_sized_internal_format(format), size, layout.data.data()); __glcheck glCompressedTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + mip_level / mipmap_count, mip_level % mipmap_count, 0, 0, layout.width_in_block * 4, layout.height_in_block * 4, get_sized_internal_format(format), size, layout.data.data());
mip_level++; mip_level++;
} }
} }
@ -370,14 +370,14 @@ namespace rsx
if (dim == rsx::texture_dimension_extended::texture_dimension_3d) if (dim == rsx::texture_dimension_extended::texture_dimension_3d)
{ {
glTexStorage3D(GL_TEXTURE_3D, mipmap_count, get_sized_internal_format(format), width, height, depth); __glcheck glTexStorage3D(GL_TEXTURE_3D, mipmap_count, get_sized_internal_format(format), width, height, depth);
if (!is_compressed_format(format)) if (!is_compressed_format(format))
{ {
const auto &format_type = get_format_type(format); const auto &format_type = get_format_type(format);
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4); __glcheck upload_texture_subresource(staging_buffer, layout, format, is_swizzled, 4);
glTexSubImage3D(GL_TEXTURE_3D, mip_level++, 0, 0, 0, layout.width_in_block, layout.height_in_block, depth, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data()); __glcheck glTexSubImage3D(GL_TEXTURE_3D, mip_level++, 0, 0, 0, layout.width_in_block, layout.height_in_block, depth, std::get<0>(format_type), std::get<1>(format_type), staging_buffer.data());
} }
} }
else else
@ -385,7 +385,7 @@ namespace rsx
for (const rsx_subresource_layout &layout : input_layouts) for (const rsx_subresource_layout &layout : input_layouts)
{ {
u32 size = layout.width_in_block * layout.height_in_block * layout.depth * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16); u32 size = layout.width_in_block * layout.height_in_block * layout.depth * ((format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16);
glCompressedTexSubImage3D(GL_TEXTURE_3D, mip_level++, 0, 0, 0, layout.width_in_block * 4, layout.height_in_block * 4, layout.depth, get_sized_internal_format(format), size, layout.data.data()); __glcheck glCompressedTexSubImage3D(GL_TEXTURE_3D, mip_level++, 0, 0, 0, layout.width_in_block * 4, layout.height_in_block * 4, layout.depth, get_sized_internal_format(format), size, layout.data.data());
} }
} }
return; return;
@ -406,6 +406,29 @@ namespace rsx
void texture::init(int index, rsx::texture& tex) void texture::init(int index, rsx::texture& tex)
{ {
switch (tex.dimension())
{
case rsx::texture_dimension::dimension3d:
if (!tex.depth())
{
return;
}
case rsx::texture_dimension::dimension2d:
if (!tex.height())
{
return;
}
case rsx::texture_dimension::dimension1d:
if (!tex.width())
{
return;
}
break;
}
const u32 texaddr = rsx::get_address(tex.offset(), tex.location()); const u32 texaddr = rsx::get_address(tex.offset(), tex.location());
//We can't re-use texture handles if using immutable storage //We can't re-use texture handles if using immutable storage
@ -433,6 +456,7 @@ namespace rsx
u32 block_sz = get_pitch_modifier(format); u32 block_sz = get_pitch_modifier(format);
__glcheck glPixelStorei(GL_UNPACK_ALIGNMENT, 4); __glcheck glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
__glcheck create_and_fill_texture(tex.get_extended_texture_dimension(), tex.get_exact_mipmap_count(), format, tex.width(), tex.height(), tex.depth(), get_subresources_layout(tex), is_swizzled, data_upload_buf); __glcheck create_and_fill_texture(tex.get_extended_texture_dimension(), tex.get_exact_mipmap_count(), format, tex.width(), tex.height(), tex.depth(), get_subresources_layout(tex), is_swizzled, data_upload_buf);
const std::array<GLenum, 4>& glRemap = get_swizzle_remap(format); const std::array<GLenum, 4>& glRemap = get_swizzle_remap(format);