casting, range check, and more compilation warning resolutions

Author: bartwe

src/gpu/d3d12/SDL_gpu_d3d12.c

@@ -1140,6 +1140,7 @@ static SDL_bool D3D12_QueryFence(
     SDL_GpuRenderer *driverData,
     SDL_GpuFence *fence)
 {
+    (void)driverData;
     D3D12Fence *d3d12Fence = (D3D12Fence *)fence;
     return ID3D12Fence_GetCompletedValue(d3d12Fence->handle) == D3D12_FENCE_SIGNAL_VALUE;
 }
@@ -2015,13 +2016,13 @@ static D3D12ComputeRootSignature *D3D12_INTERNAL_CreateComputeRootSignature(
     SDL_zeroa(descriptorRanges);
     SDL_zero(rootParameter);
 
-    d3d12ComputeRootSignature->readOnlyStorageTextureRootIndex = -1;
-    d3d12ComputeRootSignature->readOnlyStorageBufferRootIndex = -1;
-    d3d12ComputeRootSignature->readWriteStorageTextureRootIndex = -1;
-    d3d12ComputeRootSignature->readWriteStorageBufferRootIndex = -1;
+    d3d12ComputeRootSignature->readOnlyStorageTextureRootIndex = (Uint32)-1;
+    d3d12ComputeRootSignature->readOnlyStorageBufferRootIndex = (Uint32)-1;
+    d3d12ComputeRootSignature->readWriteStorageTextureRootIndex = (Uint32)-1;
+    d3d12ComputeRootSignature->readWriteStorageBufferRootIndex = (Uint32)-1;
 
     for (Uint32 i = 0; i < MAX_UNIFORM_BUFFERS_PER_STAGE; i += 1) {
-        d3d12ComputeRootSignature->uniformBufferRootIndex[i] = -1;
+        d3d12ComputeRootSignature->uniformBufferRootIndex[i] = (Uint32)-1;
     }
 
     if (createInfo->readOnlyStorageTextureCount) {
@@ -2625,13 +2626,21 @@ static D3D12Texture *D3D12_INTERNAL_CreateTexture(
 
     heapFlags = D3D12_HEAP_FLAG_NONE;
 
+    if (((textureCreateInfo->depth <= 1) && (!textureCreateInfo->isCube) && (textureCreateInfo->layerCount > UINT16_MAX))
+        || ((textureCreateInfo->depth > 1) && (textureCreateInfo->depth > UINT16_MAX))
+        || (textureCreateInfo->levelCount > UINT16_MAX)) {
+        SDL_LogError(SDL_LOG_CATEGORY_GPU, "Failed to create texture! Argument out of range.");
+        D3D12_INTERNAL_DestroyTexture(renderer, texture);
+        return NULL;
+    }
+
     if (textureCreateInfo->depth <= 1) {
         desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
         desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
         desc.Width = textureCreateInfo->width;
         desc.Height = textureCreateInfo->height;
-        desc.DepthOrArraySize = textureCreateInfo->isCube ? 6 : textureCreateInfo->layerCount;
-        desc.MipLevels = textureCreateInfo->levelCount;
+        desc.DepthOrArraySize = textureCreateInfo->isCube ? 6 : (UINT16)textureCreateInfo->layerCount;
+        desc.MipLevels = (UINT16)textureCreateInfo->levelCount;
         desc.Format = SDLToD3D12_TextureFormat[textureCreateInfo->format];
         desc.SampleDesc.Count = 1;
         desc.SampleDesc.Quality = 0;
@@ -2642,8 +2651,8 @@ static D3D12Texture *D3D12_INTERNAL_CreateTexture(
         desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
         desc.Width = textureCreateInfo->width;
         desc.Height = textureCreateInfo->height;
-        desc.DepthOrArraySize = textureCreateInfo->depth;
-        desc.MipLevels = textureCreateInfo->levelCount;
+        desc.DepthOrArraySize = (UINT16)textureCreateInfo->depth;
+        desc.MipLevels = (UINT16)textureCreateInfo->levelCount;
         desc.Format = SDLToD3D12_TextureFormat[textureCreateInfo->format];
         desc.SampleDesc.Count = 1;
         desc.SampleDesc.Quality = 0;
@@ -2761,7 +2770,7 @@ static D3D12Texture *D3D12_INTERNAL_CreateTexture(
                     rtvDesc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D;
                     rtvDesc.Texture3D.MipSlice = levelIndex;
                     rtvDesc.Texture3D.FirstWSlice = 0;
-                    rtvDesc.Texture3D.WSize = -1; /* all depths */
+                    rtvDesc.Texture3D.WSize = (UINT)-1; /* all depths */
                 } else {
                     rtvDesc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
                     rtvDesc.Texture2D.MipSlice = levelIndex;
@@ -3319,7 +3328,7 @@ static void D3D12_ReleaseShader(
     SDL_GpuRenderer *driverData,
     SDL_GpuShader *shader)
 {
-    /* D3D12Renderer *renderer = (D3D12Renderer *)driverData; */
+    (void)driverData;
     D3D12Shader *d3d12shader = (D3D12Shader *)shader;
 
     if (d3d12shader->bytecode) {
@@ -3718,7 +3727,7 @@ static void D3D12_BeginRenderPass(
                 subresource->dsvHandle.cpuHandle,
                 clearFlags,
                 depthStencilAttachmentInfo->depthStencilClearValue.depth,
-                depthStencilAttachmentInfo->depthStencilClearValue.stencil,
+                (Uint8)depthStencilAttachmentInfo->depthStencilClearValue.stencil,
                 0,
                 NULL);
         }
@@ -4409,6 +4418,7 @@ static void D3D12_DrawPrimitivesIndirect(
     Uint32 drawCount,
     Uint32 stride)
 {
+    (void)stride;
     D3D12CommandBuffer *d3d12CommandBuffer = (D3D12CommandBuffer *)commandBuffer;
     D3D12Buffer *d3d12Buffer = ((D3D12BufferContainer *)buffer)->activeBuffer;
 
@@ -4431,6 +4441,7 @@ static void D3D12_DrawIndexedPrimitivesIndirect(
     Uint32 drawCount,
     Uint32 stride)
 {
+    (void)stride;
     D3D12CommandBuffer *d3d12CommandBuffer = (D3D12CommandBuffer *)commandBuffer;
     D3D12Buffer *d3d12Buffer = ((D3D12BufferContainer *)buffer)->activeBuffer;
 
@@ -5515,6 +5526,7 @@ static SDL_bool D3D12_SupportsSwapchainComposition(
     SDL_Window *window,
     SDL_GpuSwapchainComposition swapchainComposition)
 {
+    (void)window;
     D3D12Renderer *renderer = (D3D12Renderer *)driverData;
     DXGI_FORMAT format;
     D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport;
@@ -6038,6 +6050,7 @@ static SDL_GpuTextureFormat D3D12_GetSwapchainTextureFormat(
     SDL_GpuRenderer *driverData,
     SDL_Window *window)
 {
+    (void)driverData;
     D3D12WindowData *windowData = D3D12_INTERNAL_FetchWindowData(window);
 
     if (windowData == NULL) {
@@ -6334,7 +6347,7 @@ static SDL_GpuTexture *D3D12_AcquireSwapchainTexture(
     IDXGISwapChain_GetDesc(windowData->swapchain, &swapchainDesc);
     SDL_GetWindowSize(window, &w, &h);
 
-    if (w != swapchainDesc.BufferDesc.Width || h != swapchainDesc.BufferDesc.Height) {
+    if ((INT64)w != (INT64)swapchainDesc.BufferDesc.Width || (INT64)h != (INT64)swapchainDesc.BufferDesc.Height) {
         res = D3D12_INTERNAL_ResizeSwapchain(
             renderer,
             windowData,
@@ -6686,9 +6699,14 @@ static void D3D12_Submit(
 
     /* Acquire a fence and set it to the in-flight fence */
     d3d12CommandBuffer->inFlightFence = D3D12_INTERNAL_AcquireFence(renderer);
+
+    /* Fence creation can fail, we can't handle this nicely */
     if (!d3d12CommandBuffer->inFlightFence) {
         SDL_LogError(SDL_LOG_CATEGORY_GPU, "Failed to acquire fence.");
+        SDL_assert(d3d12CommandBuffer->inFlightFence);
+        return;
     }
+
     /* Command buffer has a reference to the in-flight fence */
     (void)SDL_AtomicIncRef(&d3d12CommandBuffer->inFlightFence->referenceCount);
 
@@ -7087,6 +7105,8 @@ static SDL_bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
     IDXGIFactory6 *factory6;
     IDXGIAdapter1 *adapter;
 
+    (void)_this;
+
     /* Can we load D3D12? */
 
     d3d12_dll = SDL_LoadObject(D3D12_DLL);