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
ecb1c602
Commit
ecb1c602
authored
May 07, 2012
by
Józef Kucia
Committed by
Alexandre Julliard
May 08, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9/tests: Use consistent naming for DDS defines.
parent
25cf21bd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
31 deletions
+31
-31
surface.c
dlls/d3dx9_36/tests/surface.c
+31
-31
No files found.
dlls/d3dx9_36/tests/surface.c
View file @
ecb1c602
...
@@ -143,13 +143,13 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons
...
@@ -143,13 +143,13 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons
#define DDS_WIDTH 0x00000004
#define DDS_WIDTH 0x00000004
#define DDS_PIXELFORMAT 0x00001000
#define DDS_PIXELFORMAT 0x00001000
#define DDSCAPS_TEXTURE 0x00001000
#define DDS
_
CAPS_TEXTURE 0x00001000
#define DDS
PF_ALPHAPIXELS
0x00000001
#define DDS
_PF_ALPHA
0x00000001
#define DDS
PF_ALPHA
0x00000002
#define DDS
_PF_ALPHA_ONLY
0x00000002
#define DDSPF_FOURCC 0x00000004
#define DDS
_
PF_FOURCC 0x00000004
#define DDSPF_RGB 0x00000040
#define DDS
_
PF_RGB 0x00000040
#define DDSPF_LUMINANCE 0x00020000
#define DDS
_
PF_LUMINANCE 0x00020000
static
void
check_dds_pixel_format
(
DWORD
flags
,
DWORD
fourcc
,
DWORD
bpp
,
static
void
check_dds_pixel_format
(
DWORD
flags
,
DWORD
fourcc
,
DWORD
bpp
,
DWORD
rmask
,
DWORD
gmask
,
DWORD
bmask
,
DWORD
amask
,
DWORD
rmask
,
DWORD
gmask
,
DWORD
bmask
,
DWORD
amask
,
...
@@ -196,7 +196,7 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp,
...
@@ -196,7 +196,7 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp,
dds
.
pixel_format
.
gmask
=
gmask
;
dds
.
pixel_format
.
gmask
=
gmask
;
dds
.
pixel_format
.
bmask
=
bmask
;
dds
.
pixel_format
.
bmask
=
bmask
;
dds
.
pixel_format
.
amask
=
amask
;
dds
.
pixel_format
.
amask
=
amask
;
dds
.
caps
=
DDSCAPS_TEXTURE
;
dds
.
caps
=
DDS
_
CAPS_TEXTURE
;
hr
=
D3DXGetImageInfoFromFileInMemory
(
&
dds
,
sizeof
(
dds
),
&
info
);
hr
=
D3DXGetImageInfoFromFileInMemory
(
&
dds
,
sizeof
(
dds
),
&
info
);
ok
(
hr
==
D3D_OK
,
"D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x
\n
"
,
hr
,
expected_format
,
D3D_OK
);
ok
(
hr
==
D3D_OK
,
"D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x
\n
"
,
hr
,
expected_format
,
D3D_OK
);
...
@@ -375,30 +375,30 @@ static void test_D3DXGetImageInfo(void)
...
@@ -375,30 +375,30 @@ static void test_D3DXGetImageInfo(void)
ok
(
info
.
ImageFileFormat
==
D3DXIFF_DDS
,
"Got image file format %#x, expected %#x
\n
"
,
info
.
ImageFileFormat
,
D3DXIFF_DDS
);
ok
(
info
.
ImageFileFormat
==
D3DXIFF_DDS
,
"Got image file format %#x, expected %#x
\n
"
,
info
.
ImageFileFormat
,
D3DXIFF_DDS
);
}
else
skip
(
"Couldn't get image info from volume map in memory
\n
"
);
}
else
skip
(
"Couldn't get image info from volume map in memory
\n
"
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT1
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT1
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'2'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT2
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'2'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT2
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'3'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT3
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'3'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT3
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'4'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT4
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'4'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT4
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'5'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT5
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'5'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT5
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'R'
,
'G'
,
'B'
,
'G'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_R8G8_B8G8
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'R'
,
'G'
,
'B'
,
'G'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_R8G8_B8G8
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'G'
,
'R'
,
'G'
,
'B'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_G8R8_G8B8
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'G'
,
'R'
,
'G'
,
'B'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_G8R8_G8B8
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'U'
,
'Y'
,
'V'
,
'Y'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_UYVY
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'U'
,
'Y'
,
'V'
,
'Y'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_UYVY
);
check_dds_pixel_format
(
DDSPF_FOURCC
,
MAKEFOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_YUY2
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_YUY2
);
check_dds_pixel_format
(
DDSPF_RGB
,
0
,
16
,
0xf800
,
0x07e0
,
0x001f
,
0
,
D3DFMT_R5G6B5
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
16
,
0xf800
,
0x07e0
,
0x001f
,
0
,
D3DFMT_R5G6B5
);
check_dds_pixel_format
(
DDS
PF_RGB
|
DDSPF_ALPHAPIXELS
,
0
,
16
,
0x7c00
,
0x03e0
,
0x001f
,
0x8000
,
D3DFMT_A1R5G5B5
);
check_dds_pixel_format
(
DDS
_PF_RGB
|
DDS_PF_ALPHA
,
0
,
16
,
0x7c00
,
0x03e0
,
0x001f
,
0x8000
,
D3DFMT_A1R5G5B5
);
check_dds_pixel_format
(
DDS
PF_RGB
|
DDSPF_ALPHAPIXELS
,
0
,
16
,
0x0f00
,
0x00f0
,
0x000f
,
0xf000
,
D3DFMT_A4R4G4B4
);
check_dds_pixel_format
(
DDS
_PF_RGB
|
DDS_PF_ALPHA
,
0
,
16
,
0x0f00
,
0x00f0
,
0x000f
,
0xf000
,
D3DFMT_A4R4G4B4
);
check_dds_pixel_format
(
DDSPF_RGB
,
0
,
8
,
0xe0
,
0x1c
,
0x03
,
0
,
D3DFMT_R3G3B2
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
8
,
0xe0
,
0x1c
,
0x03
,
0
,
D3DFMT_R3G3B2
);
check_dds_pixel_format
(
DDS
PF_ALPHA
,
0
,
8
,
0
,
0
,
0
,
0xff
,
D3DFMT_A8
);
check_dds_pixel_format
(
DDS
_PF_ALPHA_ONLY
,
0
,
8
,
0
,
0
,
0
,
0xff
,
D3DFMT_A8
);
check_dds_pixel_format
(
DDS
PF_RGB
|
DDSPF_ALPHAPIXELS
,
0
,
16
,
0x00e0
,
0x001c
,
0x0003
,
0xff00
,
D3DFMT_A8R3G3B2
);
check_dds_pixel_format
(
DDS
_PF_RGB
|
DDS_PF_ALPHA
,
0
,
16
,
0x00e0
,
0x001c
,
0x0003
,
0xff00
,
D3DFMT_A8R3G3B2
);
check_dds_pixel_format
(
DDSPF_RGB
,
0
,
16
,
0xf00
,
0x0f0
,
0x00f
,
0
,
D3DFMT_X4R4G4B4
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
16
,
0xf00
,
0x0f0
,
0x00f
,
0
,
D3DFMT_X4R4G4B4
);
check_dds_pixel_format
(
DDS
PF_RGB
|
DDSPF_ALPHAPIXELS
,
0
,
32
,
0x3ff00000
,
0x000ffc00
,
0x000003ff
,
0xc0000000
,
D3DFMT_A2B10G10R10
);
check_dds_pixel_format
(
DDS
_PF_RGB
|
DDS_PF_ALPHA
,
0
,
32
,
0x3ff00000
,
0x000ffc00
,
0x000003ff
,
0xc0000000
,
D3DFMT_A2B10G10R10
);
check_dds_pixel_format
(
DDS
PF_RGB
|
DDSPF_ALPHAPIXELS
,
0
,
32
,
0x000003ff
,
0x000ffc00
,
0x3ff00000
,
0xc0000000
,
D3DFMT_A2R10G10B10
);
check_dds_pixel_format
(
DDS
_PF_RGB
|
DDS_PF_ALPHA
,
0
,
32
,
0x000003ff
,
0x000ffc00
,
0x3ff00000
,
0xc0000000
,
D3DFMT_A2R10G10B10
);
check_dds_pixel_format
(
DDS
PF_RGB
|
DDSPF_ALPHAPIXELS
,
0
,
32
,
0x00ff0000
,
0x0000ff00
,
0x000000ff
,
0xff000000
,
D3DFMT_A8R8G8B8
);
check_dds_pixel_format
(
DDS
_PF_RGB
|
DDS_PF_ALPHA
,
0
,
32
,
0x00ff0000
,
0x0000ff00
,
0x000000ff
,
0xff000000
,
D3DFMT_A8R8G8B8
);
check_dds_pixel_format
(
DDSPF_RGB
,
0
,
32
,
0xff0000
,
0x00ff00
,
0x0000ff
,
0
,
D3DFMT_X8R8G8B8
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
32
,
0xff0000
,
0x00ff00
,
0x0000ff
,
0
,
D3DFMT_X8R8G8B8
);
check_dds_pixel_format
(
DDSPF_RGB
,
0
,
32
,
0x0000ffff
,
0xffff0000
,
0
,
0
,
D3DFMT_G16R16
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
32
,
0x0000ffff
,
0xffff0000
,
0
,
0
,
D3DFMT_G16R16
);
check_dds_pixel_format
(
DDSPF_LUMINANCE
,
0
,
8
,
0xff
,
0
,
0
,
0
,
D3DFMT_L8
);
check_dds_pixel_format
(
DDS
_
PF_LUMINANCE
,
0
,
8
,
0xff
,
0
,
0
,
0
,
D3DFMT_L8
);
check_dds_pixel_format
(
DDS
PF_LUMINANCE
|
DDSPF_ALPHAPIXELS
,
0
,
16
,
0x00ff
,
0
,
0
,
0xff00
,
D3DFMT_A8L8
);
check_dds_pixel_format
(
DDS
_PF_LUMINANCE
|
DDS_PF_ALPHA
,
0
,
16
,
0x00ff
,
0
,
0
,
0xff00
,
D3DFMT_A8L8
);
check_dds_pixel_format
(
DDS
PF_LUMINANCE
|
DDSPF_ALPHAPIXELS
,
0
,
8
,
0x0f
,
0
,
0
,
0xf0
,
D3DFMT_A4L4
);
check_dds_pixel_format
(
DDS
_PF_LUMINANCE
|
DDS_PF_ALPHA
,
0
,
8
,
0x0f
,
0
,
0
,
0xf0
,
D3DFMT_A4L4
);
todo_wine
{
todo_wine
{
hr
=
D3DXGetImageInfoFromFileInMemory
(
dds_16bit
,
sizeof
(
dds_16bit
)
-
1
,
&
info
);
hr
=
D3DXGetImageInfoFromFileInMemory
(
dds_16bit
,
sizeof
(
dds_16bit
)
-
1
,
&
info
);
...
...
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