cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-04-05 09:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed a few violations of the C++ ODR

Browse source
This commit is contained in:
myT 2024-10-01 18:33:59 +02:00
parent a02057425a
commit 492427df2e
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/renderer/srp_imgui.cpp
View file

@ -31,12 +31,12 @@ along with Challenge Quake 3. If not, see <https://www.gnu.org/licenses/>.
#pragma pack(push, 4)
struct VertexRC
struct ImGUIVertexRC
{
float mvp[16];
};
struct PixelRC
struct ImGUIPixelRC
{
uint32_t texture;
uint32_t sampler;
@ -83,8 +83,8 @@ HTexture ImGUI::Init(bool ddhi_, const ShaderByteCode& vs, const ShaderByteCode&
{
RootSignatureDesc desc = *rootSigDesc;
desc.name = "Dear ImGUI";
desc.constants[ShaderStage::Vertex].byteCount = sizeof(VertexRC);
desc.constants[ShaderStage::Pixel].byteCount = sizeof(PixelRC);
desc.constants[ShaderStage::Vertex].byteCount = sizeof(ImGUIVertexRC);
desc.constants[ShaderStage::Pixel].byteCount = sizeof(ImGUIPixelRC);
rootSignature = CreateRootSignature(desc);
}
@ -203,7 +203,7 @@ void ImGUI::Draw(HTexture renderTarget)
const float R = drawData->DisplayPos.x + drawData->DisplaySize.x;
const float T = drawData->DisplayPos.y;
const float B = drawData->DisplayPos.y + drawData->DisplaySize.y;
const VertexRC vertexRC =
const ImGUIVertexRC vertexRC =
{
2.0f / (R - L), 0.0f, 0.0f, 0.0f,
0.0f, 2.0f / (T - B), 0.0f, 0.0f,
@ -255,7 +255,7 @@ void ImGUI::Draw(HTexture renderTarget)
continue;
}
PixelRC pixelRC = {};
ImGUIPixelRC pixelRC = {};
pixelRC.texture = (uint32_t)cmd->TextureId & 0xFFFF;
pixelRC.sampler = GetSamplerIndex(TW_CLAMP_TO_EDGE, TextureFilter::Linear);
pixelRC.mip = (float)(((uint32_t)cmd->TextureId >> 16) & 0xFFFF);

14
code/renderer/srp_nuklear.cpp
View file

@ -29,12 +29,12 @@ along with Challenge Quake 3. If not, see <https://www.gnu.org/licenses/>.
#pragma pack(push, 4)
struct VertexRC
struct NuklearVertexRC
{
float mvp[16];
};
struct PixelRC
struct NuklearPixelRC
{
uint32_t texture;
uint32_t sampler;
@ -75,8 +75,8 @@ void Nuklear::Init(bool ddhi_, const ShaderByteCode& vs, const ShaderByteCode& p
{
RootSignatureDesc desc = *rootSigDesc;
desc.name = "Nuklear";
desc.constants[ShaderStage::Vertex].byteCount = sizeof(VertexRC);
desc.constants[ShaderStage::Pixel].byteCount = sizeof(PixelRC);
desc.constants[ShaderStage::Vertex].byteCount = sizeof(NuklearVertexRC);
desc.constants[ShaderStage::Pixel].byteCount = sizeof(NuklearPixelRC);
rootSignature = CreateRootSignature(desc);
}
}
@ -143,7 +143,7 @@ void Nuklear::Begin(HTexture renderTarget)
const float R = glConfig.vidWidth;
const float T = 0.0f;
const float B = glConfig.vidHeight;
const VertexRC vertexRC =
const NuklearVertexRC vertexRC =
{
2.0f / (R - L), 0.0f, 0.0f, 0.0f,
0.0f, 2.0f / (T - B), 0.0f, 0.0f,
@ -208,12 +208,12 @@ void Nuklear::Draw(const nuklearDrawCommand_t& cmd)
const image_t* const image = R_GetShaderByHandle(cmd.shader)->stages[0]->bundle.image[0];
PixelRC pixelRC = {};
NuklearPixelRC pixelRC = {};
pixelRC.texture = (uint32_t)image->textureIndex;
pixelRC.sampler = GetSamplerIndex(image->wrapClampMode, TextureFilter::Linear);
if(ddhi)
{
CmdSetGraphicsRootConstants(sizeof(VertexRC), sizeof(pixelRC), &pixelRC);
CmdSetGraphicsRootConstants(sizeof(NuklearVertexRC), sizeof(pixelRC), &pixelRC);
}
else
{

10
code/renderer/srp_ui.cpp
View file

@ -25,12 +25,12 @@ along with Challenge Quake 3. If not, see <https://www.gnu.org/licenses/>.
#pragma pack(push, 4)
struct VertexRC
struct UIVertexRC
{
float scale[2];
};
struct PixelRC
struct UIPixelRC
{
uint32_t texture;
uint32_t sampler;
@ -131,7 +131,7 @@ void UI::Begin(HTexture renderTarget)
CmdBindVertexBuffers(1, &vertexBuffer, &stride, NULL);
CmdBindIndexBuffer(indexBuffer, indexType, 0);
VertexRC vertexRC = {};
UIVertexRC vertexRC = {};
vertexRC.scale[0] = 2.0f / glConfig.vidWidth;
vertexRC.scale[1] = 2.0f / glConfig.vidHeight;
if(ddhi)
@ -164,12 +164,12 @@ void UI::DrawBatch()
Q_assert(shader->stages[0] != NULL);
const textureBundle_t& bundle = shader->stages[0]->bundle;
const textureWrap_t wrapMode = bundle.image[0] != NULL ? bundle.image[0]->wrapClampMode : TW_REPEAT;
PixelRC pixelRC = {};
UIPixelRC pixelRC = {};
pixelRC.texture = GetBundleImage(bundle)->textureIndex;
pixelRC.sampler = GetSamplerIndex(wrapMode, TextureFilter::Linear);
if(ddhi)
{
CmdSetGraphicsRootConstants(sizeof(VertexRC), sizeof(PixelRC), &pixelRC);
CmdSetGraphicsRootConstants(sizeof(UIVertexRC), sizeof(UIPixelRC), &pixelRC);
}
else
{