| Index: ddraw/glRenderer.cpp |
| — | — | @@ -116,12 +116,12 @@ |
| 117 | 117 | }
|
| 118 | 118 | if (vertexsize)
|
| 119 | 119 | {
|
| 120 | | - if ((This->state.cmd->write_ptr_vertex + vertexsize) > (unsigned)This->state.cmd->vertices->size)
|
| | 120 | + if ((This->state.cmd->write_ptr_vertex + vertexsize) > This->state.cmd->vertices->size)
|
| 121 | 121 | over = TRUE;
|
| 122 | 122 | }
|
| 123 | 123 | if (indexsize)
|
| 124 | 124 | {
|
| 125 | | - if ((This->state.cmd->write_ptr_index + indexsize) > (unsigned)This->state.cmd->indices->size)
|
| | 125 | + if ((This->state.cmd->write_ptr_index + indexsize) > This->state.cmd->indices->size)
|
| 126 | 126 | over = TRUE;
|
| 127 | 127 | }
|
| 128 | 128 | if (over)
|
| — | — | @@ -786,12 +786,12 @@ |
| 787 | 787 | r1.bottom = cmd->Blt.cmd.dest->levels[0].ddsd.dwHeight;
|
| 788 | 788 | }
|
| 789 | 789 | // Check backbuffer size and resize
|
| 790 | | - if(((signed)This->backbuffer->levels[0].ddsd.dwWidth < r1.right) ||
|
| 791 | | - ((signed)This->backbuffer->levels[0].ddsd.dwHeight < r1.bottom))
|
| | 790 | + if((This->backbuffer->levels[0].ddsd.dwWidth < r1.right) ||
|
| | 791 | + (This->backbuffer->levels[0].ddsd.dwHeight < r1.bottom))
|
| 792 | 792 | {
|
| 793 | 793 | DDSURFACEDESC2 newdesc = This->backbuffer->levels[0].ddsd;
|
| 794 | | - if ((signed)newdesc.dwWidth < r1.right) newdesc.dwWidth = r1.right;
|
| 795 | | - if ((signed)newdesc.dwHeight < r1.bottom) newdesc.dwHeight = r1.bottom;
|
| | 794 | + if (newdesc.dwWidth < r1.right) newdesc.dwWidth = r1.right;
|
| | 795 | + if (newdesc.dwHeight < r1.bottom) newdesc.dwHeight = r1.bottom;
|
| 796 | 796 | tmp_cmd.SetTextureSurfaceDesc.opcode = OP_SETTEXTURESURFACEDESC;
|
| 797 | 797 | tmp_cmd.SetTextureSurfaceDesc.size = sizeof(SetTextureSurfaceDescCmd) - 8;
|
| 798 | 798 | tmp_cmd.SetTextureSurfaceDesc.level = 0;
|
| — | — | @@ -1138,13 +1138,13 @@ |
| 1139 | 1139 | (cmd->DrawScreen.texture->bigheight != (view[3]-view[2]))))
|
| 1140 | 1140 | {
|
| 1141 | 1141 | // Check backbuffer size and resize
|
| 1142 | | - if (((signed)This->backbuffer->levels[0].ddsd.dwWidth < cmd->DrawScreen.texture->bigwidth) ||
|
| 1143 | | - ((signed)This->backbuffer->levels[0].ddsd.dwHeight < cmd->DrawScreen.texture->bigheight))
|
| | 1142 | + if ((This->backbuffer->levels[0].ddsd.dwWidth < cmd->DrawScreen.texture->bigwidth) ||
|
| | 1143 | + (This->backbuffer->levels[0].ddsd.dwHeight < cmd->DrawScreen.texture->bigheight))
|
| 1144 | 1144 | {
|
| 1145 | 1145 | DDSURFACEDESC2 newdesc = This->backbuffer->levels[0].ddsd;
|
| 1146 | | - if ((signed)newdesc.dwWidth < cmd->DrawScreen.texture->bigwidth)
|
| | 1146 | + if (newdesc.dwWidth < cmd->DrawScreen.texture->bigwidth)
|
| 1147 | 1147 | newdesc.dwWidth = cmd->DrawScreen.texture->bigwidth;
|
| 1148 | | - if ((signed)newdesc.dwHeight < cmd->DrawScreen.texture->bigheight)
|
| | 1148 | + if (newdesc.dwHeight < cmd->DrawScreen.texture->bigheight)
|
| 1149 | 1149 | newdesc.dwHeight = cmd->DrawScreen.texture->bigheight;
|
| 1150 | 1150 | tmp_cmd.SetTextureSurfaceDesc.opcode = OP_SETTEXTURESURFACEDESC;
|
| 1151 | 1151 | tmp_cmd.SetTextureSurfaceDesc.size = sizeof(SetTextureSurfaceDescCmd) - 8;
|
| — | — | @@ -3631,10 +3631,10 @@ |
| 3632 | 3632 | ddsd.dwHeight = y2;
|
| 3633 | 3633 | glTexture_Create(&ddsd, &This->backbuffer, This, x2, y2, FALSE, TRUE);
|
| 3634 | 3634 | }
|
| 3635 | | - if (((signed)This->backbuffer->levels[0].ddsd.dwWidth < x2) || ((signed)This->backbuffer->levels[0].ddsd.dwHeight < y2))
|
| | 3635 | + if ((This->backbuffer->levels[0].ddsd.dwWidth < x2) || (This->backbuffer->levels[0].ddsd.dwHeight < y2))
|
| 3636 | 3636 | {
|
| 3637 | | - if ((signed)This->backbuffer->levels[0].ddsd.dwWidth > x2) x2 = This->backbuffer->levels[0].ddsd.dwWidth;
|
| 3638 | | - if ((signed)This->backbuffer->levels[0].ddsd.dwHeight > y2) y2 = This->backbuffer->levels[0].ddsd.dwHeight;
|
| | 3637 | + if (This->backbuffer->levels[0].ddsd.dwWidth > x2) x2 = This->backbuffer->levels[0].ddsd.dwWidth;
|
| | 3638 | + if (This->backbuffer->levels[0].ddsd.dwHeight > y2) y2 = This->backbuffer->levels[0].ddsd.dwHeight;
|
| 3639 | 3639 | ZeroMemory(&ddsd, sizeof(DDSURFACEDESC2));
|
| 3640 | 3640 | ddsd.dwSize = sizeof(DDSURFACEDESC2);
|
| 3641 | 3641 | ddsd.dwWidth = x2;
|
| Index: ddraw/glTexture.cpp |
| — | — | @@ -272,7 +272,7 @@ |
| 273 | 273 | }
|
| 274 | 274 | HRESULT glTexture_Lock(glTexture *This, GLint level, LPRECT r, LPDDSURFACEDESC2 ddsd, DWORD flags, BOOL backend)
|
| 275 | 275 | {
|
| 276 | | - if (level > (signed)(This->levels[0].ddsd.dwMipMapCount - 1)) return DDERR_INVALIDPARAMS;
|
| | 276 | + if (level > (This->levels[0].ddsd.dwMipMapCount - 1)) return DDERR_INVALIDPARAMS;
|
| 277 | 277 | if (!ddsd) return DDERR_INVALIDPARAMS;
|
| 278 | 278 | InterlockedIncrement(&This->levels[level].locked);
|
| 279 | 279 | if (backend)
|
| — | — | @@ -297,7 +297,7 @@ |
| 298 | 298 | }
|
| 299 | 299 | HRESULT glTexture_Unlock(glTexture *This, GLint level, LPRECT r, BOOL backend)
|
| 300 | 300 | {
|
| 301 | | - if (level > (signed)(This->levels[0].ddsd.dwMipMapCount - 1)) return DDERR_INVALIDPARAMS;
|
| | 301 | + if (level > (This->levels[0].ddsd.dwMipMapCount - 1)) return DDERR_INVALIDPARAMS;
|
| 302 | 302 | InterlockedDecrement(&This->levels[level].locked);
|
| 303 | 303 | if ((This->miplevel > 1) || dxglcfg.DebugUploadAfterUnlock)
|
| 304 | 304 | {
|