Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9d8c6326
Commit
9d8c6326
authored
Jan 09, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 09, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove stray tabs.
parent
ac914262
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
17 deletions
+14
-17
basetexture.c
dlls/wined3d/basetexture.c
+0
-1
device.c
dlls/wined3d/device.c
+3
-4
directx.c
dlls/wined3d/directx.c
+6
-7
drawprim.c
dlls/wined3d/drawprim.c
+2
-2
palette.c
dlls/wined3d/palette.c
+1
-1
surface.c
dlls/wined3d/surface.c
+1
-1
surface_gdi.c
dlls/wined3d/surface_gdi.c
+1
-1
No files found.
dlls/wined3d/basetexture.c
View file @
9d8c6326
...
@@ -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
;
...
...
dlls/wined3d/device.c
View file @
9d8c6326
...
@@ -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
.
0001
f
;
if
(
rho
<
0
.
0001
)
rho
=
0
.
0001
f
;
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 */
...
...
dlls/wined3d/directx.c
View file @
9d8c6326
...
@@ -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
|
...
...
dlls/wined3d/drawprim.c
View file @
9d8c6326
...
@@ -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
;
}
}
}
}
...
...
dlls/wined3d/palette.c
View file @
9d8c6326
/*
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.
...
...
dlls/wined3d/surface.c
View file @
9d8c6326
...
@@ -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
);
...
...
dlls/wined3d/surface_gdi.c
View file @
9d8c6326
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment