mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
a3951dc2d7
On all platforms, this would result in out of bounds accesses when getting the component sizes (which uses stuff from VertexLoader_Position.h/VertexLoader_TextCoord.h/VertexLoader_Normal.h). On platforms other than x64 and ARM64, this would also be out of bounds accesses when getting function pointers for the non-JIT vertex loader (in VertexLoader_Position.cpp etc.). Usually both of these would get data from other entries in the same multi-dimensional array, but the last few entries would be truly out of bounds. This does mean that an out of bounds function pointer can be called on platforms that don't have a JIT vertex loader, but it is limited to invalid component formats with values 5/6/7 due to the size of the bitfield the formats come from, so it seems unlikely that this could be exploited in practice. This issue affects a few games; Def Jam: Fight for New York (https://bugs.dolphin-emu.org/issues/12719) and Fifa Street are known to be affected. I have not done any hardware testing for this PR specifically, though I *think* I previously determined that at least a value of 5 behaves the same as float (4). That's what I implemented in any case. I did previously determine that both Def Jam: Fight for New York and Fifa Street use an invalid normal format, but don't actually have lighting enabled when that normal vector is used, so it doesn't change rendering in practice. The color component format also has two invalid values, but VertexLoader_Color.h/.cpp do check for those invalid ones and return a default value instead of doing an out of bounds access.
91 lines
2.9 KiB
C++
91 lines
2.9 KiB
C++
// Copyright 2008 Dolphin Emulator Project
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
#include "Common/CommonTypes.h"
|
|
#include "Common/EnumMap.h"
|
|
#include "Common/GL/GLUtil.h"
|
|
#include "Common/MsgHandler.h"
|
|
|
|
#include "VideoBackends/OGL/OGLGfx.h"
|
|
#include "VideoBackends/OGL/OGLVertexManager.h"
|
|
#include "VideoBackends/OGL/ProgramShaderCache.h"
|
|
|
|
#include "VideoCommon/NativeVertexFormat.h"
|
|
#include "VideoCommon/VertexShaderGen.h"
|
|
|
|
// Here's some global state. We only use this to keep track of what we've sent to the OpenGL state
|
|
// machine.
|
|
|
|
namespace OGL
|
|
{
|
|
std::unique_ptr<NativeVertexFormat>
|
|
OGLGfx::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl)
|
|
{
|
|
return std::make_unique<GLVertexFormat>(vtx_decl);
|
|
}
|
|
|
|
static inline GLuint VarToGL(ComponentFormat t)
|
|
{
|
|
static constexpr Common::EnumMap<GLuint, ComponentFormat::InvalidFloat7> lookup = {
|
|
GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT,
|
|
GL_FLOAT, GL_FLOAT, GL_FLOAT, GL_FLOAT,
|
|
};
|
|
return lookup[t];
|
|
}
|
|
|
|
static void SetPointer(ShaderAttrib attrib, u32 stride, const AttributeFormat& format)
|
|
{
|
|
if (!format.enable)
|
|
return;
|
|
|
|
glEnableVertexAttribArray(static_cast<GLuint>(attrib));
|
|
if (format.integer)
|
|
glVertexAttribIPointer(static_cast<GLuint>(attrib), format.components, VarToGL(format.type),
|
|
stride, (u8*)nullptr + format.offset);
|
|
else
|
|
glVertexAttribPointer(static_cast<GLuint>(attrib), format.components, VarToGL(format.type),
|
|
true, stride, (u8*)nullptr + format.offset);
|
|
}
|
|
|
|
GLVertexFormat::GLVertexFormat(const PortableVertexDeclaration& vtx_decl)
|
|
: NativeVertexFormat(vtx_decl)
|
|
{
|
|
const u32 vertex_stride = vtx_decl.stride;
|
|
|
|
// We will not allow vertex components causing uneven strides.
|
|
if (vertex_stride & 3)
|
|
PanicAlertFmt("Uneven vertex stride: {}", vertex_stride);
|
|
|
|
VertexManager* const vm = static_cast<VertexManager*>(g_vertex_manager.get());
|
|
|
|
glGenVertexArrays(1, &VAO);
|
|
glBindVertexArray(VAO);
|
|
|
|
// the element buffer is bound directly to the vao, so we must it set for every vao
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vm->GetIndexBufferHandle());
|
|
glBindBuffer(GL_ARRAY_BUFFER, vm->GetVertexBufferHandle());
|
|
|
|
SetPointer(ShaderAttrib::Position, vertex_stride, vtx_decl.position);
|
|
|
|
for (u32 i = 0; i < 3; i++)
|
|
SetPointer(ShaderAttrib::Normal + i, vertex_stride, vtx_decl.normals[i]);
|
|
|
|
for (u32 i = 0; i < 2; i++)
|
|
SetPointer(ShaderAttrib::Color0 + i, vertex_stride, vtx_decl.colors[i]);
|
|
|
|
for (u32 i = 0; i < 8; i++)
|
|
SetPointer(ShaderAttrib::TexCoord0 + i, vertex_stride, vtx_decl.texcoords[i]);
|
|
|
|
SetPointer(ShaderAttrib::PositionMatrix, vertex_stride, vtx_decl.posmtx);
|
|
|
|
// Other code shouldn't have to worry about its vertex formats being randomly unbound
|
|
ProgramShaderCache::ReBindVertexFormat();
|
|
}
|
|
|
|
GLVertexFormat::~GLVertexFormat()
|
|
{
|
|
ProgramShaderCache::InvalidateVertexFormatIfBound(VAO);
|
|
glDeleteVertexArrays(1, &VAO);
|
|
}
|
|
} // namespace OGL
|