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
de3cb3af
Commit
de3cb3af
authored
Sep 02, 2014
by
Johannes Brandstätter
Committed by
Alexandre Julliard
Sep 02, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix trace output of emulated_textureram.
parent
ac2b2e5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
directx.c
dlls/wined3d/directx.c
+2
-1
wined3d_main.c
dlls/wined3d/wined3d_main.c
+3
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/directx.c
View file @
de3cb3af
...
...
@@ -1521,7 +1521,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
if
(
wined3d_settings
.
emulated_textureram
)
{
TRACE
(
"Overriding amount of video memory with %u bytes.
\n
"
,
wined3d_settings
.
emulated_textureram
);
TRACE
(
"Overriding amount of video memory with 0x%s bytes.
\n
"
,
wine_dbgstr_longlong
(
wined3d_settings
.
emulated_textureram
));
driver_info
->
vram_bytes
=
wined3d_settings
.
emulated_textureram
;
}
...
...
dlls/wined3d/wined3d_main.c
View file @
de3cb3af
...
...
@@ -256,10 +256,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
int
TmpVideoMemorySize
=
atoi
(
buffer
);
if
(
TmpVideoMemorySize
>
0
)
{
wined3d_settings
.
emulated_textureram
=
TmpVideoMemorySize
*
1024
*
1024
;
TRACE
(
"Use %iM
B = %d byte
for emulated_textureram
\n
"
,
wined3d_settings
.
emulated_textureram
=
(
UINT64
)
TmpVideoMemorySize
*
1024
*
1024
;
TRACE
(
"Use %iM
iB = 0x%s bytes
for emulated_textureram
\n
"
,
TmpVideoMemorySize
,
wine
d3d_settings
.
emulated_textureram
);
wine
_dbgstr_longlong
(
wined3d_settings
.
emulated_textureram
)
);
}
else
ERR
(
"VideoMemorySize is %i but must be >0
\n
"
,
TmpVideoMemorySize
);
...
...
dlls/wined3d/wined3d_private.h
View file @
de3cb3af
...
...
@@ -257,7 +257,7 @@ struct wined3d_settings
unsigned
short
pci_vendor_id
;
unsigned
short
pci_device_id
;
/* Memory tracking and object counting. */
unsigned
int
emulated_textureram
;
UINT64
emulated_textureram
;
char
*
logo
;
int
allow_multisampling
;
BOOL
strict_draw_ordering
;
...
...
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