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
Johnny Cai
wine
Commits
6ac39376
Commit
6ac39376
authored
23 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Commented out references to x11drv internals from MESA code.
parent
0dd55c44
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/ddraw/d3ddevice/mesa.c
+7
-3
7 additions, 3 deletions
dlls/ddraw/d3ddevice/mesa.c
dlls/ddraw/mesa_private.h
+0
-1
0 additions, 1 deletion
dlls/ddraw/mesa_private.h
include/wine_gl.h
+0
-1
0 additions, 1 deletion
include/wine_gl.h
with
7 additions
and
5 deletions
dlls/ddraw/d3ddevice/mesa.c
+
7
−
3
View file @
6ac39376
...
@@ -172,6 +172,7 @@ is_OpenGL(
...
@@ -172,6 +172,7 @@ is_OpenGL(
TRACE
(
"Creating OpenGL device for surface %p
\n
"
,
surface
);
TRACE
(
"Creating OpenGL device for surface %p
\n
"
,
surface
);
/* Create the OpenGL context */
/* Create the OpenGL context */
#if COMPILABLE
/* First get the correct visual */
/* First get the correct visual */
ENTER_GL
();
ENTER_GL
();
/* Create the context */
/* Create the context */
...
@@ -192,7 +193,6 @@ is_OpenGL(
...
@@ -192,7 +193,6 @@ is_OpenGL(
else
else
TRACE
(
"Context created (%p)
\n
"
,
odev
->
ctx
);
TRACE
(
"Context created (%p)
\n
"
,
odev
->
ctx
);
#if COMPILABLE
/* Now override the surface's Flip method (if in double buffering) */
/* Now override the surface's Flip method (if in double buffering) */
((
x11_ds_private
*
)
surface
->
private
)
->
opengl_flip
=
TRUE
;
((
x11_ds_private
*
)
surface
->
private
)
->
opengl_flip
=
TRUE
;
{
{
...
@@ -243,13 +243,15 @@ is_OpenGL(
...
@@ -243,13 +243,15 @@ is_OpenGL(
static
ULONG
WINAPI
MESA_IDirect3DDevice2Impl_Release
(
LPDIRECT3DDEVICE2
iface
)
static
ULONG
WINAPI
MESA_IDirect3DDevice2Impl_Release
(
LPDIRECT3DDEVICE2
iface
)
{
{
ICOM_THIS
(
IDirect3DDevice2Impl
,
iface
);
ICOM_THIS
(
IDirect3DDevice2Impl
,
iface
);
D3DDPRIVATE
(
This
);
FIXME
(
"(%p)->() decrementing from %lu.
\n
"
,
This
,
This
->
ref
);
FIXME
(
"(%p)->() decrementing from %lu.
\n
"
,
This
,
This
->
ref
);
if
(
!--
(
This
->
ref
))
{
if
(
!--
(
This
->
ref
))
{
#if 0 /* broken for now */
D3DDPRIVATE(This);
ENTER_GL();
ENTER_GL();
glXDestroyContext(gdi_display, odev->ctx);
glXDestroyContext(gdi_display, odev->ctx);
LEAVE_GL();
LEAVE_GL();
#endif
This
->
private
=
NULL
;
This
->
private
=
NULL
;
HeapFree
(
GetProcessHeap
(),
0
,
This
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
return
0
;
return
0
;
...
@@ -834,6 +836,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
...
@@ -834,6 +836,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
/* First get the correct visual */
/* First get the correct visual */
/* if (surface->s.backbuffer == NULL)
/* if (surface->s.backbuffer == NULL)
attributeList[3] = None; */
attributeList[3] = None; */
#if 0 /* non working currently */
ENTER_GL();
ENTER_GL();
xvis = glXChooseVisual(gdi_display,
xvis = glXChooseVisual(gdi_display,
DefaultScreen(gdi_display),
DefaultScreen(gdi_display),
...
@@ -849,7 +852,6 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
...
@@ -849,7 +852,6 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
GL_TRUE);
GL_TRUE);
TRACE("Context created\n");
TRACE("Context created\n");
#if 0 /* non working currently */
/* Now override the surface's Flip method (if in double buffering) */
/* Now override the surface's Flip method (if in double buffering) */
surface->s.d3d_device = (void *) odev;
surface->s.d3d_device = (void *) odev;
{
{
...
@@ -889,10 +891,12 @@ static ULONG WINAPI MESA_IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface)
...
@@ -889,10 +891,12 @@ static ULONG WINAPI MESA_IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface)
FIXME
(
"(%p)->() decrementing from %lu.
\n
"
,
This
,
This
->
ref
);
FIXME
(
"(%p)->() decrementing from %lu.
\n
"
,
This
,
This
->
ref
);
if
(
!--
(
This
->
ref
))
{
if
(
!--
(
This
->
ref
))
{
#if 0 /* broken for now */
D3DDPRIVATE(This);
D3DDPRIVATE(This);
ENTER_GL();
ENTER_GL();
glXDestroyContext(gdi_display, odev->ctx);
glXDestroyContext(gdi_display, odev->ctx);
LEAVE_GL();
LEAVE_GL();
#endif
This
->
private
=
NULL
;
This
->
private
=
NULL
;
HeapFree
(
GetProcessHeap
(),
0
,
This
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
return
0
;
return
0
;
...
...
This diff is collapsed.
Click to expand it.
dlls/ddraw/mesa_private.h
+
0
−
1
View file @
6ac39376
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
#include
"d3d_private.h"
#include
"d3d_private.h"
#include
"wine_gl.h"
#include
"wine_gl.h"
#include
"x11drv.h"
/*****************************************************************************
/*****************************************************************************
* IDirect3DLight MESA private structure
* IDirect3DLight MESA private structure
...
...
This diff is collapsed.
Click to expand it.
include/wine_gl.h
+
0
−
1
View file @
6ac39376
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
#if defined(HAVE_OPENGL)
#if defined(HAVE_OPENGL)
#include
"ts_xlib.h"
#include
"ts_xlib.h"
#include
"x11drv.h"
/* As GLX relies on X, this is needed */
/* As GLX relies on X, this is needed */
#define ENTER_GL() wine_tsx11_lock()
#define ENTER_GL() wine_tsx11_lock()
...
...
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