-
Notifications
You must be signed in to change notification settings - Fork 15
Fix error for the last commit #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rboxeur
wants to merge
10,000
commits into
chrisbmr:master
Choose a base branch
from
iXit:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cf5b0c1 to
c092c7c
Compare
61ee1d0 to
952c98e
Compare
0bdb936 to
3e56da7
Compare
bfef4fa to
cb1bc64
Compare
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Based on a patch by Steven Noonan. Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Always use -I, this fixes the include search path if the prefix is set to '/usr'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46293 Signed-off-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Only switch back to initial resolution in case the device was fullscreen and is windowed now. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
The workaround is no longer needed. Fixes the last failing WINE test and actives focus window on device reset. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
D3DCREATE_NOWINDOWCHANGES is part of BehaviorFlags, not part of D3DPRESENT_PARAMETERS flags. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Clear resolution_mismatch after resolution change, as the new "correct" resolution hasn't been set yet. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Fix for issue #244. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Add the new functions of presentation interface 1.3.
Try to detect client side window decorations using X11 functions and calculate the offset using GetClientRect. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Add support for multiarch module path support. Up to two path can be set, seperated by a colon. Both path are probed for correct arch. Example: /usr/lib/d3d/d3dadapter9.so:/usr/lib64/d3d/d3dadapter9.so Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Use dladdr to find library address to create symlink to. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
A more TRACE calls to ease debugging Signed-off-by: Axel Davy <davyaxel0@gmail.com>
This new implementation should hopefully be more reliable. Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Pull "last_serial_given" out of the D3D9NINE_DRI2 block, it's required in any case. Signed-off-by: Andre Heider <a.heider@gmail.com>
Only required on the !WINE_STAGING path. Signed-off-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Andre Heider <a.heider@gmail.com>
And use the device window for the gamma ramp as well. Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Disabling compositing enhances performance and reduces lag, but can cause screen tearing. Since we handle vsync, etc this is ok. Signed-off-by: Axel Davy <davyaxel0@gmail.com>
get_d3d_drawable() returns with a lock held, unlock it after we're done. Signed-off-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
fix myself
Add build tests using travis ci. Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The latest commit won't work
Running
./configure --with-d3dadapter --with-d3dadapter-dri2-fallback
I got
d3dadapter9.so.1 not found in '/usr/lib/i386-linux-gnu/d3d'
d3dadapter9.so.1 not found in '=/usr/i686-linux-gnu/lib32/d3d'
d3dadapter9.so.1 not found in '=/usr/local/lib32/d3d'
d3dadapter9.so.1 not found in '=/lib32/d3d'
d3dadapter9.so.1 not found in '=/usr/lib32/d3d'
d3dadapter9.so.1 not found in '=/usr/i686-linux-gnu/lib/d3d'
d3dadapter9.so.1 not found in '=/usr/local/lib/i386-linux-gnu/d3d'
d3dadapter9.so.1 not found in '=/usr/local/lib/d3d'
d3dadapter9.so.1 not found in '=/lib/i386-linux-gnu/d3d'
d3dadapter9.so.1 not found in '=/lib/d3d'
d3dadapter9.so.1 not found in '=/usr/lib/i386-linux-gnu/d3d'
d3dadapter9.so.1 not found in '=/usr/lib/d3d'
configure: error: d3dadapter9.so.1 module not found, Gallium Nine won't be supported.
This is an error since --with-d3dadapter was requested.
In my config.log I got a lot of errors like below
...
| #define SONAME_LIBGL "libGL.so.1"
| #define SONAME_LIBOSMESA "libOSMesa.so.8"
| #define SONAME_D3DADAPTER9 "d3dadapter9.so.1"
| /* end confdefs.h. */
| #include <dlfcn.h>
| #include <stdlib.h>
| int
| main ()
| {
| void *handle = dlopen("/usr/lib/i386-linux-gnu/d3d" "/" SONAME_D3DADAPTER9, RTLD_GLOBAL | RTLD_NOW);
| exit((handle && dlsym(handle, "D3DAdapter9GetProc")) ? 0 : 1)
| ;
| return 0;
| }
configure:10844: gcc -o conftest -g -O2 -I/usr/include/libdrm -I./include -ldl conftest.c >&5
/tmp/ccxPjCHZ.o: In function
main': /opt/Sources/tmp/Wine-Staging-1.8-rc4/wine-ixit_2015-12-15/conftest.c:163: undefined reference todlopen'/opt/Sources/tmp/Wine-Staging-1.8-rc4/wine-ixit_2015-12-15/conftest.c:164: undefined reference to `dlsym'
collect2: error: ld returned 1 exit status
configure:10844: $? = 1
configure: program exited with status 1
configure: failed program was: