wined3d: Remove unneeded casts.
This commit is contained in:
parent
b3a58a2486
commit
18047e77e5
|
@ -386,7 +386,7 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) {
|
||||||
ULONG ref = InterlockedDecrement(&This->resource.ref);
|
ULONG ref = InterlockedDecrement(&This->resource.ref);
|
||||||
TRACE("(%p) : Releasing from %d\n", This, ref + 1);
|
TRACE("(%p) : Releasing from %d\n", This, ref + 1);
|
||||||
if (ref == 0) {
|
if (ref == 0) {
|
||||||
IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice;
|
IWineD3DDeviceImpl *device = This->resource.wineD3DDevice;
|
||||||
renderbuffer_entry_t *entry, *entry2;
|
renderbuffer_entry_t *entry, *entry2;
|
||||||
TRACE("(%p) : cleaning up\n", This);
|
TRACE("(%p) : cleaning up\n", This);
|
||||||
|
|
||||||
|
@ -724,7 +724,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v
|
||||||
}
|
}
|
||||||
|
|
||||||
top = mem + pitch * local_rect.top;
|
top = mem + pitch * local_rect.top;
|
||||||
bottom = ((BYTE *) mem) + pitch * ( local_rect.bottom - local_rect.top - 1);
|
bottom = mem + pitch * ( local_rect.bottom - local_rect.top - 1);
|
||||||
for(i = 0; i < (local_rect.bottom - local_rect.top) / 2; i++) {
|
for(i = 0; i < (local_rect.bottom - local_rect.top) / 2; i++) {
|
||||||
memcpy(row, top + off, len);
|
memcpy(row, top + off, len);
|
||||||
memcpy(top + off, bottom + off, len);
|
memcpy(top + off, bottom + off, len);
|
||||||
|
@ -759,7 +759,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v
|
||||||
for(y = local_rect.top; y < local_rect.bottom; y++) {
|
for(y = local_rect.top; y < local_rect.bottom; y++) {
|
||||||
for(x = local_rect.left; x < local_rect.right; x++) {
|
for(x = local_rect.left; x < local_rect.right; x++) {
|
||||||
/* start lines pixels */
|
/* start lines pixels */
|
||||||
BYTE *blue = (BYTE *) ((BYTE *) mem) + y * pitch + x * (sizeof(BYTE) * 3);
|
BYTE *blue = mem + y * pitch + x * (sizeof(BYTE) * 3);
|
||||||
BYTE *green = blue + 1;
|
BYTE *green = blue + 1;
|
||||||
BYTE *red = green + 1;
|
BYTE *red = green + 1;
|
||||||
|
|
||||||
|
@ -994,7 +994,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm
|
||||||
GLint prev_rasterpos[4];
|
GLint prev_rasterpos[4];
|
||||||
GLint skipBytes = 0;
|
GLint skipBytes = 0;
|
||||||
UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */
|
UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */
|
||||||
IWineD3DDeviceImpl *myDevice = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice;
|
IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice;
|
||||||
IWineD3DSwapChainImpl *swapchain;
|
IWineD3DSwapChainImpl *swapchain;
|
||||||
|
|
||||||
/* Activate the correct context for the render target */
|
/* Activate the correct context for the render target */
|
||||||
|
@ -1655,7 +1655,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
|
||||||
unsigned char *Dest;
|
unsigned char *Dest;
|
||||||
for(y = 0; y < height; y++) {
|
for(y = 0; y < height; y++) {
|
||||||
Source = (short *) (src + y * pitch);
|
Source = (short *) (src + y * pitch);
|
||||||
Dest = (unsigned char *) (dst + y * outpitch);
|
Dest = dst + y * outpitch;
|
||||||
for (x = 0; x < width; x++ ) {
|
for (x = 0; x < width; x++ ) {
|
||||||
long color = (*Source++);
|
long color = (*Source++);
|
||||||
/* B */ Dest[0] = 0xff;
|
/* B */ Dest[0] = 0xff;
|
||||||
|
@ -1693,7 +1693,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
|
||||||
unsigned char *Dest;
|
unsigned char *Dest;
|
||||||
for(y = 0; y < height; y++) {
|
for(y = 0; y < height; y++) {
|
||||||
Source = (DWORD *) (src + y * pitch);
|
Source = (DWORD *) (src + y * pitch);
|
||||||
Dest = (unsigned char *) (dst + y * outpitch);
|
Dest = dst + y * outpitch;
|
||||||
for (x = 0; x < width; x++ ) {
|
for (x = 0; x < width; x++ ) {
|
||||||
long color = (*Source++);
|
long color = (*Source++);
|
||||||
/* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */
|
/* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */
|
||||||
|
@ -1719,7 +1719,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
|
||||||
*/
|
*/
|
||||||
for(y = 0; y < height; y++) {
|
for(y = 0; y < height; y++) {
|
||||||
Source = (WORD *) (src + y * pitch);
|
Source = (WORD *) (src + y * pitch);
|
||||||
Dest = (unsigned char *) (dst + y * outpitch);
|
Dest = dst + y * outpitch;
|
||||||
for (x = 0; x < width; x++ ) {
|
for (x = 0; x < width; x++ ) {
|
||||||
short color = (*Source++);
|
short color = (*Source++);
|
||||||
unsigned char l = ((color >> 10) & 0xfc);
|
unsigned char l = ((color >> 10) & 0xfc);
|
||||||
|
@ -1772,7 +1772,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
|
||||||
*/
|
*/
|
||||||
for(y = 0; y < height; y++) {
|
for(y = 0; y < height; y++) {
|
||||||
Source = (DWORD *) (src + y * pitch);
|
Source = (DWORD *) (src + y * pitch);
|
||||||
Dest = (unsigned char *) (dst + y * outpitch);
|
Dest = dst + y * outpitch;
|
||||||
for (x = 0; x < width; x++ ) {
|
for (x = 0; x < width; x++ ) {
|
||||||
long color = (*Source++);
|
long color = (*Source++);
|
||||||
/* L */ Dest[2] = ((color >> 16) & 0xff); /* L */
|
/* L */ Dest[2] = ((color >> 16) & 0xff); /* L */
|
||||||
|
@ -1789,7 +1789,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
|
||||||
*/
|
*/
|
||||||
for(y = 0; y < height; y++) {
|
for(y = 0; y < height; y++) {
|
||||||
Source = (DWORD *) (src + y * pitch);
|
Source = (DWORD *) (src + y * pitch);
|
||||||
Dest = (unsigned char *) (dst + y * outpitch);
|
Dest = dst + y * outpitch;
|
||||||
for (x = 0; x < width; x++ ) {
|
for (x = 0; x < width; x++ ) {
|
||||||
long color = (*Source++);
|
long color = (*Source++);
|
||||||
/* B */ Dest[0] = ((color >> 16) & 0xff); /* L */
|
/* B */ Dest[0] = ((color >> 16) & 0xff); /* L */
|
||||||
|
@ -1808,8 +1808,8 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN
|
||||||
unsigned char *Source;
|
unsigned char *Source;
|
||||||
unsigned char *Dest;
|
unsigned char *Dest;
|
||||||
for(y = 0; y < height; y++) {
|
for(y = 0; y < height; y++) {
|
||||||
Source = (unsigned char *) (src + y * pitch);
|
Source = src + y * pitch;
|
||||||
Dest = (unsigned char *) (dst + y * outpitch);
|
Dest = dst + y * outpitch;
|
||||||
for (x = 0; x < width; x++ ) {
|
for (x = 0; x < width; x++ ) {
|
||||||
unsigned char color = (*Source++);
|
unsigned char color = (*Source++);
|
||||||
/* A */ Dest[1] = (color & 0xf0) << 0;
|
/* A */ Dest[1] = (color & 0xf0) << 0;
|
||||||
|
|
|
@ -651,7 +651,7 @@ static HRESULT
|
||||||
case 2: COLORFILL_ROW(WORD)
|
case 2: COLORFILL_ROW(WORD)
|
||||||
case 3:
|
case 3:
|
||||||
{
|
{
|
||||||
BYTE *d = (BYTE *) buf;
|
BYTE *d = buf;
|
||||||
for (x = 0; x < width; x++,d+=3)
|
for (x = 0; x < width; x++,d+=3)
|
||||||
{
|
{
|
||||||
d[0] = (color ) & 0xFF;
|
d[0] = (color ) & 0xFF;
|
||||||
|
@ -1427,8 +1427,8 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface,
|
||||||
|
|
||||||
/* Since slock was originally copied from this surface's description, we can just reuse it */
|
/* Since slock was originally copied from this surface's description, we can just reuse it */
|
||||||
assert(This->resource.allocatedMemory != NULL);
|
assert(This->resource.allocatedMemory != NULL);
|
||||||
sbuf = (BYTE *)This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp;
|
sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp;
|
||||||
dbuf = (BYTE *)This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp;
|
dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp;
|
||||||
sEntry = getFormatDescEntry(Src->resource.format, NULL, NULL);
|
sEntry = getFormatDescEntry(Src->resource.format, NULL, NULL);
|
||||||
dEntry = sEntry;
|
dEntry = sEntry;
|
||||||
}
|
}
|
||||||
|
@ -1514,8 +1514,8 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface,
|
||||||
{
|
{
|
||||||
BYTE *d, *s;
|
BYTE *d, *s;
|
||||||
DWORD tmp;
|
DWORD tmp;
|
||||||
s = (BYTE *) sbuf;
|
s = sbuf;
|
||||||
d = (BYTE *) dbuf;
|
d = dbuf;
|
||||||
for (y = 0; y < h; y++)
|
for (y = 0; y < h; y++)
|
||||||
{
|
{
|
||||||
for (x = 0; x < w * 3; x += 3)
|
for (x = 0; x < w * 3; x += 3)
|
||||||
|
|
|
@ -140,7 +140,7 @@ ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) {
|
||||||
ULONG ref = InterlockedDecrement(&This->resource.ref);
|
ULONG ref = InterlockedDecrement(&This->resource.ref);
|
||||||
TRACE("(%p) : Releasing from %d\n", This, ref + 1);
|
TRACE("(%p) : Releasing from %d\n", This, ref + 1);
|
||||||
if (ref == 0) {
|
if (ref == 0) {
|
||||||
IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice;
|
IWineD3DDeviceImpl *device = This->resource.wineD3DDevice;
|
||||||
TRACE("(%p) : cleaning up\n", This);
|
TRACE("(%p) : cleaning up\n", This);
|
||||||
|
|
||||||
if(This->Flags & SFLAG_DIBSECTION) {
|
if(This->Flags & SFLAG_DIBSECTION) {
|
||||||
|
@ -254,7 +254,7 @@ static HRESULT WINAPI
|
||||||
IWineGDISurfaceImpl_UnlockRect(IWineD3DSurface *iface)
|
IWineGDISurfaceImpl_UnlockRect(IWineD3DSurface *iface)
|
||||||
{
|
{
|
||||||
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
|
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
|
||||||
IWineD3DDeviceImpl *dev = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice;
|
IWineD3DDeviceImpl *dev = This->resource.wineD3DDevice;
|
||||||
TRACE("(%p)\n", This);
|
TRACE("(%p)\n", This);
|
||||||
|
|
||||||
if (!(This->Flags & SFLAG_LOCKED))
|
if (!(This->Flags & SFLAG_LOCKED))
|
||||||
|
@ -492,7 +492,7 @@ const char* filename)
|
||||||
table[i][2] = This->palette->palents[i].peBlue;
|
table[i][2] = This->palette->palents[i].peBlue;
|
||||||
}
|
}
|
||||||
for (y = 0; y < This->pow2Height; y++) {
|
for (y = 0; y < This->pow2Height; y++) {
|
||||||
unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface));
|
unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface));
|
||||||
for (x = 0; x < This->pow2Width; x++) {
|
for (x = 0; x < This->pow2Width; x++) {
|
||||||
unsigned char color = *src;
|
unsigned char color = *src;
|
||||||
src += 1;
|
src += 1;
|
||||||
|
@ -514,7 +514,7 @@ const char* filename)
|
||||||
alpha_shift = get_shift(formatEntry->alphaMask);
|
alpha_shift = get_shift(formatEntry->alphaMask);
|
||||||
|
|
||||||
for (y = 0; y < This->pow2Height; y++) {
|
for (y = 0; y < This->pow2Height; y++) {
|
||||||
unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface));
|
unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface));
|
||||||
for (x = 0; x < This->pow2Width; x++) {
|
for (x = 0; x < This->pow2Width; x++) {
|
||||||
unsigned int color;
|
unsigned int color;
|
||||||
unsigned int comp;
|
unsigned int comp;
|
||||||
|
|
Loading…
Reference in New Issue