Module: wine Branch: master Commit: 9d8c6326c0c18ff35d53239293a7787d4afd21b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8c6326c0c18ff35d53239293...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jan 9 10:23:43 2009 +0100
wined3d: Remove stray tabs.
---
dlls/wined3d/basetexture.c | 1 - dlls/wined3d/device.c | 7 +++---- dlls/wined3d/directx.c | 13 ++++++------- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/palette.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_gdi.c | 2 +- 7 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 158650e..8622e94 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -249,7 +249,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface) glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); } } - } else { /* this only happened if we've run out of openGL textures */ WARN("This texture doesn't have an openGL texture assigned to it\n"); hr = WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8187f5b..fb9dd6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1954,7 +1954,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW object->parent = Parent; object->wineD3DDevice = This; object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); - object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion));
if(!object->hpal) { @@ -2880,9 +2879,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I if (rho < 0.0001) rho = 0.0001f; object->exponent = -0.3/log(cos(rho/2)); } - if (object->exponent > 128.0) { - object->exponent = 128.0; - } + if (object->exponent > 128.0) { + object->exponent = 128.0; + } object->cutoff = pLight->Phi*90/M_PI;
/* FIXME: Range */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7c0fa14..639b07e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -520,8 +520,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ENTER_GL();
gl_string = (const char *) glGetString(GL_RENDERER); - if (NULL == gl_string) - gl_string = "None"; + if (!gl_string) gl_string = "None"; strcpy(gl_info->gl_renderer, gl_string);
gl_string = (const char *) glGetString(GL_VENDOR); @@ -3152,11 +3151,11 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->RasterCaps |= WINED3DPRASTERCAPS_FOGRANGE; } /* FIXME Add: - WINED3DPRASTERCAPS_COLORPERSPECTIVE - WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE - WINED3DPRASTERCAPS_ANTIALIASEDGES - WINED3DPRASTERCAPS_ZBUFFERLESSHSR - WINED3DPRASTERCAPS_WBUFFER */ + WINED3DPRASTERCAPS_COLORPERSPECTIVE + WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE + WINED3DPRASTERCAPS_ANTIALIASEDGES + WINED3DPRASTERCAPS_ZBUFFERLESSHSR + WINED3DPRASTERCAPS_WBUFFER */
pCaps->ZCmpCaps = WINED3DPCMPCAPS_ALWAYS | WINED3DPCMPCAPS_EQUAL | diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6224162..b78078f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -202,8 +202,8 @@ void primitiveDeclarationConvertToStridedData( element->Usage == WINED3DDECLUSAGE_POSITIONT)) { static BOOL warned = FALSE; if(!warned) { - /* This may be bad with the fixed function pipeline */ - FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); + /* This may be bad with the fixed function pipeline */ + FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); warned = TRUE; } } diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 8f6e37a..338e66e 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -1,4 +1,4 @@ -/* DirectDraw - IDirectPalette base interface +/* DirectDraw - IDirectPalette base interface * * Copyright 1997-2000 Marcus Meissner * Copyright 2000-2001 TransGaming Technologies Inc. diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2837740..1793696 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1830,7 +1830,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Dest = (WORD *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { WORD color = *Source++; - *Dest = color; + *Dest = color; if ((color < This->SrcBltCKey.dwColorSpaceLowValue) || (color > This->SrcBltCKey.dwColorSpaceHighValue)) { *Dest |= (1 << 15); diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 07a13b5..7e53cd3 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -341,7 +341,7 @@ const char* filename)
for (y = 0; y < This->pow2Height; y++) { const 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 comp; int i;
-
Alexandre Julliard