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
ece3af78
Commit
ece3af78
authored
Aug 20, 2015
by
Józef Kucia
Committed by
Alexandre Julliard
Aug 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Use D3DFMT constants instead of MAKEFOURCC codes.
parent
520deb14
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
25 deletions
+25
-25
surface.c
dlls/d3dx9_36/surface.c
+9
-9
surface.c
dlls/d3dx9_36/tests/surface.c
+16
-16
No files found.
dlls/d3dx9_36/surface.c
View file @
ece3af78
...
...
@@ -146,15 +146,15 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc)
{
unsigned
int
i
;
static
const
DWORD
known_fourcc
[]
=
{
MAKEFOURCC
(
'U'
,
'Y'
,
'V'
,
'Y'
)
,
MAKEFOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
)
,
MAKEFOURCC
(
'R'
,
'G'
,
'B'
,
'G'
)
,
MAKEFOURCC
(
'G'
,
'R'
,
'G'
,
'B'
)
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'2'
)
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'3'
)
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'4'
)
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'5'
)
,
D3DFMT_UYVY
,
D3DFMT_YUY2
,
D3DFMT_R8G8_B8G8
,
D3DFMT_G8R8_G8B8
,
D3DFMT_DXT1
,
D3DFMT_DXT2
,
D3DFMT_DXT3
,
D3DFMT_DXT4
,
D3DFMT_DXT5
,
D3DFMT_R16F
,
D3DFMT_G16R16F
,
D3DFMT_A16B16G16R16F
,
...
...
dlls/d3dx9_36/tests/surface.c
View file @
ece3af78
...
...
@@ -318,19 +318,19 @@ static void test_dds_header_handling(void)
{
{
32
,
DDS_PF_RGB
|
DDS_PF_ALPHA
,
0
,
32
,
0x00ff0000
,
0x0000ff00
,
0x000000ff
,
0xff000000
},
DDS_PITCH
,
4
,
4
,
-
1
/* pitch */
,
0
,
64
,
{
D3D_OK
,
1
}
},
/* linear size is ignored */
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
0
,
4
,
4
,
0
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
0
,
4
,
4
,
0
,
0
,
7
/* pixel data size */
,
{
D3DXERR_INVALIDDATA
,
1
}
},
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
0
/* linear size */
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
0
/* linear size */
,
0
,
8
,
{
D3D_OK
,
1
}
},
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
1
/* linear size */
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
1
/* linear size */
,
0
,
8
,
{
D3D_OK
,
1
}
},
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
2
/* linear size */
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
2
/* linear size */
,
0
,
8
,
{
D3D_OK
,
1
}
},
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
9
/* linear size */
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
9
/* linear size */
,
0
,
8
,
{
D3D_OK
,
1
}
},
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
16
/* linear size */
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
16
/* linear size */
,
0
,
8
,
{
D3D_OK
,
1
}
},
{
{
32
,
DDS_PF_FOURCC
,
MAKEFOURCC
(
'D'
,
'X'
,
'T'
,
'1'
)
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
-
1
/* linear size */
,
0
,
{
{
32
,
DDS_PF_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
},
DDS_LINEARSIZE
,
4
,
4
,
-
1
/* linear size */
,
0
,
8
,
{
D3D_OK
,
1
}
},
/* integer overflows */
{
{
32
,
DDS_PF_RGB
,
0
,
32
,
0xff0000
,
0x00ff00
,
0x0000ff
,
0
},
0
,
0x80000000
,
0x80000000
/* 0x80000000 * 0x80000000 * 4 = 0 */
,
0
,
0
,
...
...
@@ -610,15 +610,15 @@ 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
(
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_FOURCC
,
D3DFMT_DXT1
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT1
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_DXT2
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT2
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_DXT3
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT3
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_DXT4
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT4
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_DXT5
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_DXT5
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_R8G8_B8G8
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_R8G8_B8G8
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_G8R8_G8B8
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_G8R8_G8B8
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_UYVY
,
0
,
0
,
0
,
0
,
0
,
D3DFMT_UYVY
);
check_dds_pixel_format
(
DDS_PF_FOURCC
,
D3DFMT_YUY2
,
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
);
...
...
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