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
dfccba71
Commit
dfccba71
authored
Nov 04, 2003
by
Jason Edmeades
Committed by
Alexandre Julliard
Nov 04, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass through floats correctly to the render states at
initialization. Fixes point problems.
parent
d970c097
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
stateblock.c
dlls/d3d8/stateblock.c
+9
-8
surface.c
dlls/d3d8/surface.c
+1
-1
No files found.
dlls/d3d8/stateblock.c
View file @
dfccba71
...
...
@@ -57,6 +57,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_InitStartupStateBlock(IDirect3DDevice8Impl* T
D3DLINEPATTERN
lp
;
int
i
;
int
j
;
float
tmpfloat
=
0
.
0
f
;
LPDIRECT3DDEVICE8
iface
=
(
LPDIRECT3DDEVICE8
)
This
;
/* Note this may have a large overhead but it should only be executed
...
...
@@ -97,9 +98,9 @@ HRESULT WINAPI IDirect3DDeviceImpl_InitStartupStateBlock(IDirect3DDevice8Impl* T
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_ZVISIBLE
,
0
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGCOLOR
,
0
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGTABLEMODE
,
D3DFOG_NONE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGSTART
,
0
.
0
f
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGEND
,
1
.
0
f
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGDENSITY
,
1
.
0
f
);
tmpfloat
=
0
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGSTART
,
*
((
DWORD
*
)
&
tmpfloat
)
);
tmpfloat
=
1
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGEND
,
*
((
DWORD
*
)
&
tmpfloat
)
);
tmpfloat
=
1
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_FOGDENSITY
,
*
((
DWORD
*
)
&
tmpfloat
)
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_EDGEANTIALIAS
,
FALSE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_ZBIAS
,
0
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_RANGEFOGENABLE
,
FALSE
);
...
...
@@ -141,8 +142,8 @@ HRESULT WINAPI IDirect3DDeviceImpl_InitStartupStateBlock(IDirect3DDevice8Impl* T
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_VERTEXBLEND
,
D3DVBF_DISABLE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_CLIPPLANEENABLE
,
0
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_SOFTWAREVERTEXPROCESSING
,
FALSE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSIZE
,
1
.
0
f
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSIZE_MIN
,
0
.
0
f
);
tmpfloat
=
1
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSIZE
,
*
((
DWORD
*
)
&
tmpfloat
)
);
tmpfloat
=
0
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSIZE_MIN
,
*
((
DWORD
*
)
&
tmpfloat
)
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSPRITEENABLE
,
FALSE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSCALEENABLE
,
FALSE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSCALE_A
,
TRUE
);
...
...
@@ -151,12 +152,12 @@ HRESULT WINAPI IDirect3DDeviceImpl_InitStartupStateBlock(IDirect3DDevice8Impl* T
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_MULTISAMPLEANTIALIAS
,
TRUE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_MULTISAMPLEMASK
,
0xFFFFFFFF
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_PATCHEDGESTYLE
,
D3DPATCHEDGE_DISCRETE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_PATCHSEGMENTS
,
1
.
0
f
);
tmpfloat
=
1
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_PATCHSEGMENTS
,
*
((
DWORD
*
)
&
tmpfloat
)
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_DEBUGMONITORTOKEN
,
D3DDMT_DISABLE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSIZE_MAX
,
(
DWORD
)
64
.
0
f
);
tmpfloat
=
64
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POINTSIZE_MAX
,
(
DWORD
)
*
((
DWORD
*
)
&
tmpfloat
)
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_INDEXEDVERTEXBLENDENABLE
,
FALSE
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_COLORWRITEENABLE
,
0x0000000F
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_TWEENFACTOR
,
(
DWORD
)
0
.
0
f
);
tmpfloat
=
0
.
0
f
;
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_TWEENFACTOR
,
(
DWORD
)
*
((
DWORD
*
)
&
tmpfloat
)
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_BLENDOP
,
D3DBLENDOP_ADD
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_POSITIONORDER
,
D3DORDER_CUBIC
);
IDirect3DDevice8Impl_SetRenderState
(
iface
,
D3DRS_NORMALORDER
,
D3DORDER_LINEAR
);
...
...
dlls/d3d8/surface.c
View file @
dfccba71
...
...
@@ -284,7 +284,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) {
ICOM_THIS
(
IDirect3DSurface8Impl
,
iface
);
if
(
FALSE
==
This
->
locked
)
{
ERR
(
"trying to
lock
unlocked surf@%p
\n
"
,
This
);
ERR
(
"trying to
Unlock an
unlocked surf@%p
\n
"
,
This
);
return
D3DERR_INVALIDCALL
;
}
...
...
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