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
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
Alexey Alyaev
wine
Commits
ecb1c602
"README" did not exist on "9f8d4d0b0a1b559a2c5dc79b73f63c0359020148"
Commit
ecb1c602
authored
12 years ago
by
Józef Kucia
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
d3dx9/tests: Use consistent naming for DDS defines.
parent
25cf21bd
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/d3dx9_36/tests/surface.c
+31
-31
31 additions, 31 deletions
dlls/d3dx9_36/tests/surface.c
with
31 additions
and
31 deletions
dlls/d3dx9_36/tests/surface.c
+
31
−
31
View file @
ecb1c602
...
...
@@ -143,13 +143,13 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons
#define DDS_WIDTH 0x00000004
#define DDS_PIXELFORMAT 0x00001000
#define DDSCAPS_TEXTURE 0x00001000
#define DDS
_
CAPS_TEXTURE 0x00001000
#define DDSPF_ALPHA
PIXELS
0x00000001
#define DDSPF_ALPHA 0x00000002
#define DDSPF_FOURCC 0x00000004
#define DDSPF_RGB 0x00000040
#define DDSPF_LUMINANCE 0x00020000
#define DDS
_
PF_ALPHA 0x00000001
#define DDS
_
PF_ALPHA
_ONLY
0x00000002
#define DDS
_
PF_FOURCC 0x00000004
#define DDS
_
PF_RGB 0x00000040
#define DDS
_
PF_LUMINANCE 0x00020000
static
void
check_dds_pixel_format
(
DWORD
flags
,
DWORD
fourcc
,
DWORD
bpp
,
DWORD
rmask
,
DWORD
gmask
,
DWORD
bmask
,
DWORD
amask
,
...
...
@@ -196,7 +196,7 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp,
dds
.
pixel_format
.
gmask
=
gmask
;
dds
.
pixel_format
.
bmask
=
bmask
;
dds
.
pixel_format
.
amask
=
amask
;
dds
.
caps
=
DDSCAPS_TEXTURE
;
dds
.
caps
=
DDS
_
CAPS_TEXTURE
;
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
);
...
...
@@ -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
);
}
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
(
DDSPF_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
(
DDSPF_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
(
DDSPF_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
(
DDSPF_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
(
DDSPF_RGB
,
0
,
16
,
0xf800
,
0x07e0
,
0x001f
,
0
,
D3DFMT_R5G6B5
);
check_dds_pixel_format
(
DDSPF_RGB
|
DDSPF_ALPHA
PIXELS
,
0
,
16
,
0x7c00
,
0x03e0
,
0x001f
,
0x8000
,
D3DFMT_A1R5G5B5
);
check_dds_pixel_format
(
DDSPF_RGB
|
DDSPF_ALPHA
PIXELS
,
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
(
DDSPF_ALPHA
,
0
,
8
,
0
,
0
,
0
,
0xff
,
D3DFMT_A8
);
check_dds_pixel_format
(
DDSPF_RGB
|
DDSPF_ALPHA
PIXELS
,
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
(
DDSPF_RGB
|
DDSPF_ALPHA
PIXELS
,
0
,
32
,
0x3ff00000
,
0x000ffc00
,
0x000003ff
,
0xc0000000
,
D3DFMT_A2B10G10R10
);
check_dds_pixel_format
(
DDSPF_RGB
|
DDSPF_ALPHA
PIXELS
,
0
,
32
,
0x000003ff
,
0x000ffc00
,
0x3ff00000
,
0xc0000000
,
D3DFMT_A2R10G10B10
);
check_dds_pixel_format
(
DDSPF_RGB
|
DDSPF_ALPHA
PIXELS
,
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
(
DDSPF_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
(
DDSPF_LUMINANCE
|
DDSPF_ALPHA
PIXELS
,
0
,
16
,
0x00ff
,
0
,
0
,
0xff00
,
D3DFMT_A8L8
);
check_dds_pixel_format
(
DDSPF_LUMINANCE
|
DDSPF_ALPHA
PIXELS
,
0
,
8
,
0x0f
,
0
,
0
,
0xf0
,
D3DFMT_A4L4
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT1
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'2'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT2
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'3'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT3
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'4'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT4
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'5'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT5
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'R'
,
'G'
,
'B'
,
'G'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_R8G8_B8G8
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'G'
,
'R'
,
'G'
,
'B'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_G8R8_G8B8
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'U'
,
'Y'
,
'V'
,
'Y'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_UYVY
);
check_dds_pixel_format
(
DDS
_
PF_FOURCC
,
MAKEFOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
),
0
,
0
,
0
,
0
,
0
,
D3DFMT_YUY2
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
16
,
0xf800
,
0x07e0
,
0x001f
,
0
,
D3DFMT_R5G6B5
);
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
|
DDS
_
PF_ALPHA
,
0
,
16
,
0x0f00
,
0x00f0
,
0x000f
,
0xf000
,
D3DFMT_A4R4G4B4
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
8
,
0xe0
,
0x1c
,
0x03
,
0
,
D3DFMT_R3G3B2
);
check_dds_pixel_format
(
DDS
_
PF_ALPHA
_ONLY
,
0
,
8
,
0
,
0
,
0
,
0xff
,
D3DFMT_A8
);
check_dds_pixel_format
(
DDS
_
PF_RGB
|
DDS
_
PF_ALPHA
,
0
,
16
,
0x00e0
,
0x001c
,
0x0003
,
0xff00
,
D3DFMT_A8R3G3B2
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
16
,
0xf00
,
0x0f0
,
0x00f
,
0
,
D3DFMT_X4R4G4B4
);
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
|
DDS
_
PF_ALPHA
,
0
,
32
,
0x000003ff
,
0x000ffc00
,
0x3ff00000
,
0xc0000000
,
D3DFMT_A2R10G10B10
);
check_dds_pixel_format
(
DDS
_
PF_RGB
|
DDS
_
PF_ALPHA
,
0
,
32
,
0x00ff0000
,
0x0000ff00
,
0x000000ff
,
0xff000000
,
D3DFMT_A8R8G8B8
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
32
,
0xff0000
,
0x00ff00
,
0x0000ff
,
0
,
D3DFMT_X8R8G8B8
);
check_dds_pixel_format
(
DDS
_
PF_RGB
,
0
,
32
,
0x0000ffff
,
0xffff0000
,
0
,
0
,
D3DFMT_G16R16
);
check_dds_pixel_format
(
DDS
_
PF_LUMINANCE
,
0
,
8
,
0xff
,
0
,
0
,
0
,
D3DFMT_L8
);
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
|
DDS
_
PF_ALPHA
,
0
,
8
,
0x0f
,
0
,
0
,
0xf0
,
D3DFMT_A4L4
);
todo_wine
{
hr
=
D3DXGetImageInfoFromFileInMemory
(
dds_16bit
,
sizeof
(
dds_16bit
)
-
1
,
&
info
);
...
...
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