Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CodeQL recommendations #580

Merged
merged 6 commits into from
Feb 12, 2025
Merged

CodeQL recommendations #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0704e5b
CodeQL recommendations
walbourn Feb 8, 2025
e263467
Code review
walbourn Feb 10, 2025
91d4dbe
YAML tweaks
walbourn Feb 10, 2025
6f419d9
Add assert
walbourn Feb 11, 2025
d41464d
Code review feedback\
walbourn Feb 11, 2025
f26de8e
Code review feedback
walbourn Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 40 additions & 20 deletions Auxiliary/DirectXTexXboxDetile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ namespace
const uint8_t* sptr = xbox.GetPointer();
const uint8_t* endPtr = sptr + layout.SizeBytes;

for (uint32_t item = 0; item < nimages; ++item)
assert((nimages > 0) && (nimages <= UINT32_MAX));
walbourn marked this conversation as resolved.
Show resolved Hide resolved

for (size_t item = 0; item < nimages; ++item)
{
const Image* img = result[item];
if (!img || !img->pixels)
Expand All @@ -49,9 +51,9 @@ namespace
{
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
const UINT64 element = (packed) ? (x >> 1) : x;
const size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, 0, item, 0, nullptr);
const size_t offset = computer->GetTexelElementOffsetBytes(0, static_cast<uint32_t>(level), element, 0, static_cast<uint32_t>(item), 0, nullptr);
#else
const size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0);
const size_t offset = computer->GetTexelElementOffsetBytes(0, static_cast<uint32_t>(level), x, 0, static_cast<uint32_t>(item), 0);
#endif
if (offset == size_t(-1))
return E_FAIL;
Expand Down Expand Up @@ -83,7 +85,7 @@ namespace
_In_reads_(nimages) const Image** result,
size_t nimages)
{
if (!nimages)
if (!nimages || nimages > UINT32_MAX)
return E_INVALIDARG;

if (!xbox.GetPointer() || !computer || !result || !result[0])
Expand Down Expand Up @@ -150,7 +152,7 @@ namespace
return E_FAIL;

// Perform detiling
for (uint32_t item = 0; item < nimages; ++item)
for (size_t item = 0; item < nimages; ++item)
{
const Image* img = result[item];
if (!img || !img->pixels)
Expand All @@ -164,9 +166,9 @@ namespace
for (size_t x = 0; x < img->width; ++x)
{
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0, nullptr);
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0, nullptr);
#else
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0);
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0);
#endif
if (offset == size_t(-1))
return E_FAIL;
Expand Down Expand Up @@ -199,7 +201,7 @@ namespace
_In_reads_(nimages) const Image** result,
size_t nimages)
{
if (!nimages)
if (!nimages || nimages > UINT32_MAX)
return E_INVALIDARG;

if (!xbox.GetPointer() || !computer || !result || !result[0])
Expand All @@ -210,7 +212,7 @@ namespace
uint8_t* baseAddr = xbox.GetPointer();
const auto& metadata = xbox.GetMetadata();

for (uint32_t item = 0; item < nimages; ++item)
for (size_t item = 0; item < nimages; ++item)
{
const Image* img = result[item];
if (!img || !img->pixels)
Expand Down Expand Up @@ -314,6 +316,11 @@ HRESULT Xbox::Detile(
{
case TEX_DIMENSION_TEXTURE1D:
{
if (metadata.width > D3D11_REQ_TEXTURE1D_U_DIMENSION
|| metadata.mipLevels > D3D11_REQ_MIP_LEVELS
|| metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION)
return E_INVALIDARG;

XG_TEXTURE1D_DESC desc = {};
desc.Width = static_cast<UINT>(metadata.width);
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
Expand Down Expand Up @@ -348,13 +355,13 @@ HRESULT Xbox::Detile(
if (FAILED(hr))
return hr;

for (uint32_t level = 0; level < metadata.mipLevels; ++level)
for (size_t level = 0; level < metadata.mipLevels; ++level)
{
if (metadata.arraySize > 1)
{
std::vector<const Image*> images;
images.reserve(metadata.arraySize);
for (uint32_t item = 0; item < metadata.arraySize; ++item)
for (size_t item = 0; item < metadata.arraySize; ++item)
{
const Image* img = image.GetImage(level, item, 0);
if (!img)
Expand All @@ -366,7 +373,7 @@ HRESULT Xbox::Detile(
images.push_back(img);
}

hr = Detile1D(xbox, level, computer.Get(), layout, &images[0], images.size());
hr = Detile1D(xbox, static_cast<uint32_t>(level), computer.Get(), layout, &images[0], images.size());
}
else
{
Expand All @@ -377,7 +384,7 @@ HRESULT Xbox::Detile(
return E_FAIL;
}

hr = Detile1D(xbox, level, computer.Get(), layout, &img, 1);
hr = Detile1D(xbox, static_cast<uint32_t>(level), computer.Get(), layout, &img, 1);
}

if (FAILED(hr))
Expand All @@ -391,6 +398,12 @@ HRESULT Xbox::Detile(

case TEX_DIMENSION_TEXTURE2D:
{
if (metadata.width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
|| metadata.height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
|| metadata.mipLevels > D3D11_REQ_MIP_LEVELS
|| metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION)
return E_INVALIDARG;

XG_TEXTURE2D_DESC desc = {};
desc.Width = static_cast<UINT>(metadata.width);
desc.Height = static_cast<UINT>(metadata.height);
Expand Down Expand Up @@ -427,13 +440,13 @@ HRESULT Xbox::Detile(
if (FAILED(hr))
return hr;

for (uint32_t level = 0; level < metadata.mipLevels; ++level)
for (size_t level = 0; level < metadata.mipLevels; ++level)
{
if (metadata.arraySize > 1)
{
std::vector<const Image*> images;
images.reserve(metadata.arraySize);
for (uint32_t item = 0; item < metadata.arraySize; ++item)
for (size_t item = 0; item < metadata.arraySize; ++item)
{
const Image* img = image.GetImage(level, item, 0);
if (!img)
Expand All @@ -445,7 +458,7 @@ HRESULT Xbox::Detile(
images.push_back(img);
}

hr = Detile2D(xbox, level, computer.Get(), &images[0], images.size());
hr = Detile2D(xbox, static_cast<uint32_t>(level), computer.Get(), &images[0], images.size());
}
else
{
Expand All @@ -456,7 +469,7 @@ HRESULT Xbox::Detile(
return E_FAIL;
}

hr = Detile2D(xbox, level, computer.Get(), &img, 1);
hr = Detile2D(xbox, static_cast<uint32_t>(level), computer.Get(), &img, 1);
}

if (FAILED(hr))
Expand All @@ -470,6 +483,13 @@ HRESULT Xbox::Detile(

case TEX_DIMENSION_TEXTURE3D:
{
if (metadata.width > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
|| metadata.height > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
|| metadata.depth > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
|| metadata.mipLevels > D3D11_REQ_MIP_LEVELS
|| metadata.arraySize != 1)
return E_INVALIDARG;

XG_TEXTURE3D_DESC desc = {};
desc.Width = static_cast<UINT>(metadata.width);
desc.Height = static_cast<UINT>(metadata.height);
Expand Down Expand Up @@ -504,10 +524,10 @@ HRESULT Xbox::Detile(
if (FAILED(hr))
return hr;

uint32_t d = static_cast<uint32_t>(metadata.depth);
auto d = static_cast<uint32_t>(metadata.depth);

size_t index = 0;
for (uint32_t level = 0; level < metadata.mipLevels; ++level)
for (size_t level = 0; level < metadata.mipLevels; ++level)
{
if ((index + d) > image.GetImageCount())
{
Expand All @@ -516,7 +536,7 @@ HRESULT Xbox::Detile(
}

// Relies on the fact that slices are contiguous
hr = Detile3D(xbox, level, computer.Get(), image.GetImages()[index]);
hr = Detile3D(xbox, static_cast<uint32_t>(level), computer.Get(), image.GetImages()[index]);
if (FAILED(hr))
{
image.Release();
Expand Down
Loading
Loading