-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Am 2013-08-26 16:16, schrieb Matteo Bruni:
2013/8/26 Stefan Dösinger
<stefan(a)codeweavers.com>om>:
Try 2: *) Require only GPU access for buffers *)
Reduce number of
checkGLcall invocations *) Remove a return from an ERR case ---
dlls/wined3d/utils.c | 1 + dlls/wined3d/volume.c
| 168 ++++++++++++++++++++++++++++++++++++-----
dlls/wined3d/wined3d_private.h | 7 +- 3 files changed, 157
insertions(+), 19 deletions(-)
+ case WINED3D_LOCATION_BUFFER: +
if
(!volume->pbo || !(volume->flags & WINED3D_VFLAG_PBO)) +
ERR("Trying to load WINED3D_LOCATION_BUFFER without setting it up
first.\n"); + + if (volume->locations &
WINED3D_LOCATION_DISCARDED) + { +
TRACE("Volume previously discarded, nothing to do.\n"); +
wined3d_volume_invalidate_location(volume,
WINED3D_LOCATION_DISCARDED); + } + else if
(volume->locations & WINED3D_LOCATION_TEXTURE_RGB) +
{ + struct wined3d_bo_address data = {volume->pbo,
NULL}; + volume_bind_and_dirtify(volume,
context); + wined3d_volume_download_data(volume,
context, &data); + } + else + {
+ FIXME("Implement WINED3D_LOCATION_SYSMEM loading
from %s.\n", +
wined3d_debug_location(volume->locations)); +
return; + } +
wined3d_volume_validate_location(volume,
WINED3D_LOCATION_BUFFER); + break; +
Not really an actual review, but that FIXME looks wrong
(copy-paste remnant probably).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
Comment: Using GnuPG with Thunderbird -
http://www.enigmail.net/
iQIcBAEBAgAGBQJSG4LPAAoJEN0/YqbEcdMwGAwP/iqKhyveAbNI99/ZIGAIqrEj
qIcDBaeOLm6Y/17lW2VV6WqU/puRragzyN6IgAA2ikE5F68avBoYAIDuX2EOPsdm
Szy8ssm814aSULRGomzKv1ABWi0dtBU+SqoDj0o5e3k5JHM+R+3A3DglvdWfXfav
pKdi6nPuKEwJ5KM/lEdeAT6iNSjbtXlF/6FWw2DNwgQf8Tm7wbiQp5CqCN+9ZYtB
X3/uvbsGoBLgH/XGeB7P2CM5WL3hldCqjpAbW7HI9Tveg6iIvv4SR3fraMIfBmKs
CCIbLbuWOCFaKfTJFD5mVowdREOJgPLbL08UCYCPiMtaFY0wGDZinAsTBOYMJBLH
np9PyaftGJQ1uoSizk+7bIHMOOvtN+pBi+hwVqM2/wwXgb+lD8NUwmivMcjHpaH1
ofUZ6ZepFWP1mOEV5Lsr4ioAteSbcq8ExAziXfSyFQQp2WR6vZhKZXI3CWvEC5Z0
LiY1Bmr5M5shTwAn7RB3uGNTPU5G0qHN7Buz3fmycJGTPNwAfTzh9GRdEu9OdP9H
QZ1D90S68BgNXWpiShyjsCnWfEq21JV98058OOaELQMrRNcMFizitBup1t4KkO7J
Qj9KDgUcQ0czeuze422OPjfODJINeDpebtr21RNFO3v8+9+JJO4xYAToN3tq6HGW
04W0HIj+a22vGYBiY+pQ
=JWIJ
-----END PGP SIGNATURE-----