Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ccea415c
Commit
ccea415c
authored
Mar 01, 2010
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Mar 02, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix multisampling on cards without 32-bit RGB fbconfigs.
parent
1d39e74c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
directx.c
dlls/wined3d/directx.c
+16
-10
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/directx.c
View file @
ccea415c
...
...
@@ -2702,7 +2702,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U
continue
;
if
(
cfgs
[
i
].
blueSize
!=
blueSize
)
continue
;
if
(
cfgs
[
i
].
alphaSize
!=
alphaSize
)
/* Not all drivers report alpha-less formats since they use 32-bit anyway, so accept alpha even if we didn't ask for it. */
if
(
alphaSize
&&
cfgs
[
i
].
alphaSize
!=
alphaSize
)
continue
;
if
(
cfgs
[
i
].
colorSize
!=
(
glDesc
->
byte_count
<<
3
))
continue
;
TRACE
(
"Found iPixelFormat=%d to support MultiSampleType=%d for format %s
\n
"
,
cfgs
[
i
].
iPixelFormat
,
MultiSampleType
,
debug_d3dformat
(
SurfaceFormat
));
...
...
@@ -4772,8 +4775,8 @@ BOOL InitAdapters(IWineD3DImpl *This)
if
(
gl_info
->
supported
[
WGL_ARB_PIXEL_FORMAT
])
{
int
attribute
;
int
attribs
[
1
0
];
int
values
[
1
0
];
int
attribs
[
1
1
];
int
values
[
1
1
];
int
nAttribs
=
0
;
attribute
=
WGL_NUMBER_PIXEL_FORMATS_ARB
;
...
...
@@ -4785,6 +4788,7 @@ BOOL InitAdapters(IWineD3DImpl *This)
attribs
[
nAttribs
++
]
=
WGL_GREEN_BITS_ARB
;
attribs
[
nAttribs
++
]
=
WGL_BLUE_BITS_ARB
;
attribs
[
nAttribs
++
]
=
WGL_ALPHA_BITS_ARB
;
attribs
[
nAttribs
++
]
=
WGL_COLOR_BITS_ARB
;
attribs
[
nAttribs
++
]
=
WGL_DEPTH_BITS_ARB
;
attribs
[
nAttribs
++
]
=
WGL_STENCIL_BITS_ARB
;
attribs
[
nAttribs
++
]
=
WGL_DRAW_TO_WINDOW_ARB
;
...
...
@@ -4805,12 +4809,13 @@ BOOL InitAdapters(IWineD3DImpl *This)
cfgs
->
greenSize
=
values
[
1
];
cfgs
->
blueSize
=
values
[
2
];
cfgs
->
alphaSize
=
values
[
3
];
cfgs
->
depthSize
=
values
[
4
];
cfgs
->
stencilSize
=
values
[
5
];
cfgs
->
windowDrawable
=
values
[
6
];
cfgs
->
iPixelType
=
values
[
7
];
cfgs
->
doubleBuffer
=
values
[
8
];
cfgs
->
auxBuffers
=
values
[
9
];
cfgs
->
colorSize
=
values
[
4
];
cfgs
->
depthSize
=
values
[
5
];
cfgs
->
stencilSize
=
values
[
6
];
cfgs
->
windowDrawable
=
values
[
7
];
cfgs
->
iPixelType
=
values
[
8
];
cfgs
->
doubleBuffer
=
values
[
9
];
cfgs
->
auxBuffers
=
values
[
10
];
cfgs
->
pbufferDrawable
=
FALSE
;
/* Check for pbuffer support when it is around as
...
...
@@ -4837,7 +4842,7 @@ BOOL InitAdapters(IWineD3DImpl *This)
}
}
TRACE
(
"iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d,
windowDrawable=%d, pbufferDrawable=%d
\n
"
,
cfgs
->
iPixelFormat
,
cfgs
->
iPixelType
,
cfgs
->
doubleBuffer
,
cfgs
->
redSize
,
cfgs
->
greenSize
,
cfgs
->
blueSize
,
cfgs
->
alphaSize
,
cfgs
->
depthSize
,
cfgs
->
stencilSize
,
cfgs
->
windowDrawable
,
cfgs
->
pbufferDrawable
);
TRACE
(
"iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d,
samples=%d, windowDrawable=%d, pbufferDrawable=%d
\n
"
,
cfgs
->
iPixelFormat
,
cfgs
->
iPixelType
,
cfgs
->
doubleBuffer
,
cfgs
->
redSize
,
cfgs
->
greenSize
,
cfgs
->
blueSize
,
cfgs
->
alphaSize
,
cfgs
->
depthSize
,
cfgs
->
stencilSize
,
cfgs
->
numSamples
,
cfgs
->
windowDrawable
,
cfgs
->
pbufferDrawable
);
cfgs
++
;
}
}
...
...
@@ -4871,6 +4876,7 @@ BOOL InitAdapters(IWineD3DImpl *This)
cfgs
->
greenSize
=
ppfd
.
cGreenBits
;
cfgs
->
blueSize
=
ppfd
.
cBlueBits
;
cfgs
->
alphaSize
=
ppfd
.
cAlphaBits
;
cfgs
->
colorSize
=
ppfd
.
cColorBits
;
cfgs
->
depthSize
=
ppfd
.
cDepthBits
;
cfgs
->
stencilSize
=
ppfd
.
cStencilBits
;
cfgs
->
pbufferDrawable
=
0
;
...
...
dlls/wined3d/wined3d_private.h
View file @
ccea415c
...
...
@@ -1238,7 +1238,7 @@ typedef struct WineD3D_PixelFormat
{
int
iPixelFormat
;
/* WGL pixel format */
int
iPixelType
;
/* WGL pixel type e.g. WGL_TYPE_RGBA_ARB, WGL_TYPE_RGBA_FLOAT_ARB or WGL_TYPE_COLORINDEX_ARB */
int
redSize
,
greenSize
,
blueSize
,
alphaSize
;
int
redSize
,
greenSize
,
blueSize
,
alphaSize
,
colorSize
;
int
depthSize
,
stencilSize
;
BOOL
windowDrawable
;
BOOL
pbufferDrawable
;
...
...
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