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
f2115004
Commit
f2115004
authored
Sep 12, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 13, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D().
Most of these would just be the result of the application giving us invalid pixel formats.
parent
be32dd86
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
utils.c
dlls/ddraw/utils.c
+11
-11
No files found.
dlls/ddraw/utils.c
View file @
f2115004
...
...
@@ -426,7 +426,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
{
return
WINED3DFMT_B2G3R3A8_UNORM
;
}
ERR
(
"16 bit RGB Pixel format does not match
\n
"
);
WARN
(
"16 bit RGB Pixel format does not match.
\n
"
);
return
WINED3DFMT_UNKNOWN
;
case
24
:
...
...
@@ -445,10 +445,10 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
return
WINED3DFMT_B8G8R8X8_UNORM
;
}
ERR
(
"32 bit RGB pixel format does not match
\n
"
);
WARN
(
"32 bit RGB pixel format does not match.
\n
"
);
default:
ERR
(
"Invalid dwRGBBitCount in Pixelformat structure
\n
"
);
WARN
(
"Invalid dwRGBBitCount in Pixelformat structure.
\n
"
);
return
WINED3DFMT_UNKNOWN
;
}
}
...
...
@@ -460,12 +460,12 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
case
1
:
case
2
:
case
4
:
ERR
(
"Unsupported Alpha-Only bit depth 0x%x
\n
"
,
DDPixelFormat
->
u1
.
dwAlphaBitDepth
);
FIXME
(
"Unsupported Alpha-Only bit depth 0x%x.
\n
"
,
DDPixelFormat
->
u1
.
dwAlphaBitDepth
);
case
8
:
return
WINED3DFMT_A8_UNORM
;
default:
ERR
(
"Invalid AlphaBitDepth in Alpha-Only Pixelformat
\n
"
);
WARN
(
"Invalid AlphaBitDepth in Alpha-Only Pixelformat.
\n
"
);
return
WINED3DFMT_UNKNOWN
;
}
}
...
...
@@ -480,17 +480,17 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
case
4
:
if
(
DDPixelFormat
->
u1
.
dwAlphaBitDepth
==
4
)
return
WINED3DFMT_L4A4_UNORM
;
ERR
(
"Unknown Alpha / Luminance bit depth combination
\n
"
);
WARN
(
"Unknown Alpha / Luminance bit depth combination.
\n
"
);
return
WINED3DFMT_UNKNOWN
;
case
6
:
ERR
(
"A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!
\n
"
);
FIXME
(
"A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.
\n
"
);
return
WINED3DFMT_R5G5_SNORM_L6_UNORM
;
case
8
:
if
(
DDPixelFormat
->
u1
.
dwAlphaBitDepth
==
8
)
return
WINED3DFMT_L8A8_UNORM
;
ERR
(
"Unknown Alpha / Lumincase bit depth combination
\n
"
);
WARN
(
"Unknown Alpha / Lumincase bit depth combination.
\n
"
);
return
WINED3DFMT_UNKNOWN
;
}
}
...
...
@@ -500,14 +500,14 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
switch
(
DDPixelFormat
->
u1
.
dwLuminanceBitCount
)
{
case
6
:
ERR
(
"A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!
\n
"
);
FIXME
(
"A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.
\n
"
);
return
WINED3DFMT_R5G5_SNORM_L6_UNORM
;
case
8
:
return
WINED3DFMT_L8_UNORM
;
default:
ERR
(
"Unknown luminance-only bit depth 0x%x
\n
"
,
DDPixelFormat
->
u1
.
dwLuminanceBitCount
);
WARN
(
"Unknown luminance-only bit depth 0x%x.
\n
"
,
DDPixelFormat
->
u1
.
dwLuminanceBitCount
);
return
WINED3DFMT_UNKNOWN
;
}
}
...
...
@@ -599,7 +599,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat
}
}
ERR
(
"Unknown Pixelformat!
\n
"
);
WARN
(
"Unknown Pixelformat.
\n
"
);
return
WINED3DFMT_UNKNOWN
;
}
...
...
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