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
c6602b40
Commit
c6602b40
authored
Jul 28, 2005
by
Mike McCormack
Committed by
Alexandre Julliard
Jul 28, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Signed warning fixes.
parent
d877c5c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
device.c
dlls/wined3d/device.c
+10
-9
directx.c
dlls/wined3d/directx.c
+2
-2
surface.c
dlls/wined3d/surface.c
+3
-3
No files found.
dlls/wined3d/device.c
View file @
c6602b40
...
...
@@ -2880,8 +2880,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
case
WINED3DRS_STENCILFAIL
:
{
GLenum
fail
;
GL
enum
zpass
;
GL
enum
zfail
;
GL
int
zpass
;
GL
int
zfail
;
fail
=
StencilOp
(
Value
);
glGetIntegerv
(
GL_STENCIL_PASS_DEPTH_PASS
,
&
zpass
);
...
...
@@ -2896,8 +2896,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
break
;
case
WINED3DRS_STENCILZFAIL
:
{
GL
enum
fail
;
GL
enum
zpass
;
GL
int
fail
;
GL
int
zpass
;
GLenum
zfail
;
glGetIntegerv
(
GL_STENCIL_FAIL
,
&
fail
);
...
...
@@ -2913,9 +2913,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
break
;
case
WINED3DRS_STENCILPASS
:
{
GL
enum
fail
;
GL
int
fail
;
GLenum
zpass
;
GL
enum
zfail
;
GL
int
zfail
;
glGetIntegerv
(
GL_STENCIL_FAIL
,
&
fail
);
checkGLcall
(
"glGetIntegerv(GL_STENCIL_FAIL, &fail);"
);
...
...
@@ -4871,7 +4871,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3
* NOTE: move code to surface to accomplish this
****************************************/
IWineD3DSurfaceImpl
*
pSrcSurface
=
(
IWineD3DSurfaceImpl
*
)
pSourceSurface
;
int
srcWidth
,
srcHeight
,
srcSurfaceWidth
,
srcSurfaceHeight
,
destSurfaceWidth
,
destSurfaceHeight
;
int
srcWidth
,
srcHeight
;
unsigned
int
srcSurfaceWidth
,
srcSurfaceHeight
,
destSurfaceWidth
,
destSurfaceHeight
;
WINED3DFORMAT
destFormat
,
srcFormat
;
UINT
destSize
;
int
destLeft
,
destTop
;
...
...
@@ -5325,8 +5326,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_CleanRender(IWineD3DDevice* iface, IWineD3DSwa
HRESULT
WINAPI
IWineD3DDeviceImpl_FindGLContext
(
IWineD3DDevice
*
iface
,
IWineD3DSurface
*
pSurface
,
glContext
**
context
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
int
i
;
int
width
;
int
height
;
unsigned
int
width
;
unsigned
int
height
;
WINED3DFORMAT
format
;
WINED3DSURFACE_DESC
surfaceDesc
;
memset
(
&
surfaceDesc
,
0
,
sizeof
(
surfaceDesc
));
...
...
dlls/wined3d/directx.c
View file @
c6602b40
...
...
@@ -562,7 +562,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
}
}
#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB(#pfn);
#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB(
(const GLubyte *)
#pfn);
GL_EXT_FUNCS_GEN
;
#undef USE_GL_FUNC
...
...
@@ -588,7 +588,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
}
}
#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB(#pfn);
#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB(
(const GLubyte *)
#pfn);
GLX_EXT_FUNCS_GEN
;
#undef USE_GL_FUNC
...
...
dlls/wined3d/surface.c
View file @
c6602b40
...
...
@@ -370,7 +370,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, D3DLOCKED_RE
}
else
if
(
D3DUSAGE_RENDERTARGET
&
This
->
resource
.
usage
&&
!
(
Flags
&
D3DLOCK_DISCARD
))
{
/* render surfaces */
GLint
prev_store
;
GL
enum
prev_read
;
GL
int
prev_read
;
BOOL
notInContext
=
FALSE
;
IWineD3DSwapChainImpl
*
targetSwapChain
=
NULL
;
...
...
@@ -610,7 +610,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
if
(
iface
==
implSwapChain
->
backBuffer
||
iface
==
implSwapChain
->
frontBuffer
||
iface
==
myDevice
->
renderTarget
)
{
GLint
prev_store
;
GL
enum
prev_draw
;
GL
int
prev_draw
;
GLint
prev_rasterpos
[
4
];
ENTER_GL
();
...
...
@@ -797,7 +797,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
This
->
resource
.
format
==
WINED3DFMT_DXT5
)
FIXME
(
"Format %d not supported
\n
"
,
This
->
resource
.
format
);
else
{
GL
enum
prevRead
;
GL
int
prevRead
;
glGetIntegerv
(
GL_READ_BUFFER
,
&
prevRead
);
vcheckGLcall
(
"glGetIntegerv"
);
glReadBuffer
(
GL_BACK
);
...
...
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