Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Felix Münchhalfen
wine
Commits
b0485d5b
Commit
b0485d5b
authored
26 years ago
by
Lionel Ulmer
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
- various warning and bug fixes
parent
1d3e501e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
graphics/d3dmaterial.c
+2
-0
2 additions, 0 deletions
graphics/d3dmaterial.c
graphics/d3dviewport.c
+14
-2
14 additions, 2 deletions
graphics/d3dviewport.c
with
16 additions
and
2 deletions
graphics/d3dmaterial.c
+
2
−
0
View file @
b0485d5b
...
...
@@ -52,6 +52,8 @@ static void activate(LPDIRECT3DMATERIAL2 this) {
TRACE
(
ddraw
,
"Size : %ld
\n
"
,
this
->
mat
.
dwSize
);
TRACE
(
ddraw
,
"Power : %f
\n
"
,
this
->
mat
.
e
.
power
);
TRACE
(
ddraw
,
"Texture handle : %p
\n
"
,
this
->
mat
.
hTexture
);
return
;
}
...
...
This diff is collapsed.
Click to expand it.
graphics/d3dviewport.c
+
14
−
2
View file @
b0485d5b
...
...
@@ -147,6 +147,18 @@ static HRESULT WINAPI IDirect3DViewport2_SetViewport(LPDIRECT3DVIEWPORT2 this,
this
->
use_vp2
=
0
;
this
->
viewport
.
vp1
=
*
lpvp
;
TRACE
(
ddraw
,
"dwSize = %ld dwX = %ld dwY = %ld
\n
"
,
lpvp
->
dwSize
,
lpvp
->
dwX
,
lpvp
->
dwY
);
TRACE
(
ddraw
,
"dwWidth = %ld dwHeight = %ld
\n
"
,
lpvp
->
dwWidth
,
lpvp
->
dwHeight
);
TRACE
(
ddraw
,
"dvScaleX = %f dvScaleY = %f
\n
"
,
lpvp
->
dvScaleX
,
lpvp
->
dvScaleY
);
TRACE
(
ddraw
,
"dvMaxX = %f dvMaxY = %f
\n
"
,
lpvp
->
dvMaxX
,
lpvp
->
dvMaxY
);
TRACE
(
ddraw
,
"dvMinZ = %f dvMaxZ = %f
\n
"
,
lpvp
->
dvMinZ
,
lpvp
->
dvMaxZ
);
return
DD_OK
;
}
...
...
@@ -174,7 +186,7 @@ static HRESULT WINAPI IDirect3DViewport2_LightElements(LPDIRECT3DVIEWPORT2 this,
static
HRESULT
WINAPI
IDirect3DViewport2_SetBackground
(
LPDIRECT3DVIEWPORT2
this
,
D3DMATERIALHANDLE
hMat
)
{
FIXME
(
ddraw
,
"(%p)->(%08x): stub
\n
"
,
this
,
hMat
);
FIXME
(
ddraw
,
"(%p)->(%08
l
x): stub
\n
"
,
this
,
(
DWORD
)
hMat
);
return
DD_OK
;
}
...
...
@@ -220,13 +232,13 @@ static HRESULT WINAPI IDirect3DViewport2_Clear(LPDIRECT3DVIEWPORT2 this,
this
->
device
.
active_device2
->
set_context
(
this
->
device
.
active_device2
);
else
this
->
device
.
active_device1
->
set_context
(
this
->
device
.
active_device1
);
}
/* Clears the screen */
glGetBooleanv
(
GL_DEPTH_TEST
,
&
ztest
);
glDepthMask
(
GL_TRUE
);
/* Enables Z writing to be sure to delete also the Z buffer */
glClear
(
GL_COLOR_BUFFER_BIT
|
GL_DEPTH_BUFFER_BIT
);
glDepthMask
(
ztest
);
}
return
DD_OK
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment