Commit 9d8c6326 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Remove stray tabs.

parent ac914262
...@@ -249,7 +249,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface) ...@@ -249,7 +249,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface)
glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
} }
} }
} else { /* this only happened if we've run out of openGL textures */ } 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"); WARN("This texture doesn't have an openGL texture assigned to it\n");
hr = WINED3DERR_INVALIDCALL; hr = WINED3DERR_INVALIDCALL;
......
...@@ -1954,7 +1954,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW ...@@ -1954,7 +1954,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW
object->parent = Parent; object->parent = Parent;
object->wineD3DDevice = This; object->wineD3DDevice = This;
object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); object->palNumEntries = IWineD3DPaletteImpl_Size(Flags);
object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion)); object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion));
if(!object->hpal) { if(!object->hpal) {
...@@ -2880,9 +2879,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I ...@@ -2880,9 +2879,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I
if (rho < 0.0001) rho = 0.0001f; if (rho < 0.0001) rho = 0.0001f;
object->exponent = -0.3/log(cos(rho/2)); object->exponent = -0.3/log(cos(rho/2));
} }
if (object->exponent > 128.0) { if (object->exponent > 128.0) {
object->exponent = 128.0; object->exponent = 128.0;
} }
object->cutoff = pLight->Phi*90/M_PI; object->cutoff = pLight->Phi*90/M_PI;
/* FIXME: Range */ /* FIXME: Range */
......
...@@ -520,8 +520,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ...@@ -520,8 +520,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
ENTER_GL(); ENTER_GL();
gl_string = (const char *) glGetString(GL_RENDERER); gl_string = (const char *) glGetString(GL_RENDERER);
if (NULL == gl_string) if (!gl_string) gl_string = "None";
gl_string = "None";
strcpy(gl_info->gl_renderer, gl_string); strcpy(gl_info->gl_renderer, gl_string);
gl_string = (const char *) glGetString(GL_VENDOR); gl_string = (const char *) glGetString(GL_VENDOR);
...@@ -3152,11 +3151,11 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, ...@@ -3152,11 +3151,11 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
pCaps->RasterCaps |= WINED3DPRASTERCAPS_FOGRANGE; pCaps->RasterCaps |= WINED3DPRASTERCAPS_FOGRANGE;
} }
/* FIXME Add: /* FIXME Add:
WINED3DPRASTERCAPS_COLORPERSPECTIVE WINED3DPRASTERCAPS_COLORPERSPECTIVE
WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE
WINED3DPRASTERCAPS_ANTIALIASEDGES WINED3DPRASTERCAPS_ANTIALIASEDGES
WINED3DPRASTERCAPS_ZBUFFERLESSHSR WINED3DPRASTERCAPS_ZBUFFERLESSHSR
WINED3DPRASTERCAPS_WBUFFER */ WINED3DPRASTERCAPS_WBUFFER */
pCaps->ZCmpCaps = WINED3DPCMPCAPS_ALWAYS | pCaps->ZCmpCaps = WINED3DPCMPCAPS_ALWAYS |
WINED3DPCMPCAPS_EQUAL | WINED3DPCMPCAPS_EQUAL |
......
...@@ -202,8 +202,8 @@ void primitiveDeclarationConvertToStridedData( ...@@ -202,8 +202,8 @@ void primitiveDeclarationConvertToStridedData(
element->Usage == WINED3DDECLUSAGE_POSITIONT)) { element->Usage == WINED3DDECLUSAGE_POSITIONT)) {
static BOOL warned = FALSE; static BOOL warned = FALSE;
if(!warned) { if(!warned) {
/* This may be bad with the fixed function pipeline */ /* This may be bad with the fixed function pipeline */
FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n");
warned = TRUE; warned = TRUE;
} }
} }
......
/* DirectDraw - IDirectPalette base interface /* DirectDraw - IDirectPalette base interface
* *
* Copyright 1997-2000 Marcus Meissner * Copyright 1997-2000 Marcus Meissner
* Copyright 2000-2001 TransGaming Technologies Inc. * Copyright 2000-2001 TransGaming Technologies Inc.
......
...@@ -1830,7 +1830,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI ...@@ -1830,7 +1830,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI
Dest = (WORD *) (dst + y * outpitch); Dest = (WORD *) (dst + y * outpitch);
for (x = 0; x < width; x++ ) { for (x = 0; x < width; x++ ) {
WORD color = *Source++; WORD color = *Source++;
*Dest = color; *Dest = color;
if ((color < This->SrcBltCKey.dwColorSpaceLowValue) || if ((color < This->SrcBltCKey.dwColorSpaceLowValue) ||
(color > This->SrcBltCKey.dwColorSpaceHighValue)) { (color > This->SrcBltCKey.dwColorSpaceHighValue)) {
*Dest |= (1 << 15); *Dest |= (1 << 15);
......
...@@ -341,7 +341,7 @@ const char* filename) ...@@ -341,7 +341,7 @@ const char* filename)
for (y = 0; y < This->pow2Height; y++) { for (y = 0; y < This->pow2Height; y++) {
const unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); 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 color;
unsigned int comp; unsigned int comp;
int i; int i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment