Commit graph

1451 commits

Author SHA1 Message Date
Henrik Rydgard
75b7ccd739 Clean up D3DX loader a little 2014-08-23 10:01:03 +02:00
Henrik Rydgard
7708558c2f Remove a comment, add some checks. 2014-08-23 09:47:30 +02:00
Henrik Rydgård
1179d29323 Merge pull request #231 from unknownbrackets/thin3d
Fix Android/Linux compilation
2014-08-23 09:38:16 +02:00
Unknown W. Brackets
8c35e4b5fc Fix some type conversion warnings. 2014-08-23 00:35:14 -07:00
Unknown W. Brackets
110f640ca8 Fix Linux/Android compilation. 2014-08-23 00:35:13 -07:00
Henrik Rydgard
1401de50dc Thin3d: Minor shader cleanup 2014-08-22 21:26:46 +02:00
Henrik Rydgard
ff5df25135 Add Thin3d support to draw_text (Qt not touched) 2014-08-22 20:54:28 +02:00
Henrik Rydgard
a1ff7a4488 Thin3D: Add APIName query. Swizzle texture colors in D3D.
(not sure whether it's best done in the shader or in the texture data...)
2014-08-22 20:54:27 +02:00
Henrik Rydgard
ecb33f005e Thin3D now actually draws some stuff 2014-08-22 20:54:27 +02:00
Henrik Rydgard
8774fcad94 Some more thin3d 2014-08-22 20:54:26 +02:00
Henrik Rydgard
54b298a63e More Thin3D work (textures etc) 2014-08-22 20:54:26 +02:00
Henrik Rydgard
29a60b5952 Thin3d: Add cull mode, other fixes 2014-08-22 20:54:25 +02:00
Henrik Rydgard
bf41d05dfc Switch to Thin3DTexture. GL still works, d3d still broken. 2014-08-22 20:54:25 +02:00
Henrik Rydgard
1251b6df79 Thin3d: Add some untested texturing stuff 2014-08-22 20:54:25 +02:00
Henrik Rydgard
a0f7f877e2 Fix vertex declarations. Hook up some more of D3D9 (doesn't work yet) 2014-08-22 20:54:24 +02:00
Henrik Rydgard
40b67e27cf Crashfix 2014-08-22 20:54:24 +02:00
Henrik Rydgard
a9b5fe44bf Slip thin3d underneath DrawBuffer/UI 2014-08-22 20:54:23 +02:00
Henrik Rydgard
c1bc4215f2 Thin3D: A thin OpenGL/D3D9 wrapper for basic rendering.
Only the OpenGL implementation actually works yet.
2014-08-22 20:54:23 +02:00
Henrik Rydgard
cea002e39a Update GLEW with GL4.4 support 2014-08-21 10:21:37 +02:00
Sacha
14d2fa9a39 Drop the thread from Qt audio loop. Makes exit cleaner.
Probably needs to be reworked or replaced with SDL it seems.
2014-08-21 03:46:00 +10:00
Henrik Rydgård
2ba8e36b2b Merge pull request #229 from thedax/sliderfloat-step
Update PopupSliderChoiceFloat to have increment/decrement buttons, and stepping.
2014-08-16 22:56:08 +02:00
The Dax
cfae07f72b Need to initialise step_ here, too. 2014-08-16 15:15:01 -04:00
The Dax
69e66df07e Update PopupSliderChoiceFloat to have increment/decrement buttons, and stepping. 2014-08-16 15:07:06 -04:00
Henrik Rydgård
4f3c69e714 Merge pull request #227 from ToadKing/master
add ability to create opaque FBO objects from native opengl FBOs
2014-08-06 00:48:03 +02:00
Toad King
fbafdb4e35 add ability to create opaque FBO objects from native opengl FBOs 2014-08-05 17:43:25 -04:00
Henrik Rydgård
9b038d40be Merge pull request #226 from unknownbrackets/gpu-blend
Use glBlendEquationSeparate for ADD on alpha
2014-08-04 22:10:59 +02:00
Unknown W. Brackets
deed84f997 Reassert the add equation in UIContext.
Otherwise it might use subtract or some other equation.

Fixes another case of hrydgard/ppsspp#6678.
2014-08-03 21:38:29 -07:00
Unknown W. Brackets
130865577d Use glBlendEquationSeparate for ADD on alpha. 2014-08-03 21:38:29 -07:00
Unknown W. Brackets
ddf67c5f72 Add glStencilMask to glstate. 2014-08-03 21:38:28 -07:00
Unknown W. Brackets
9f239b9685 Warning fix. 2014-08-03 19:09:45 -07:00
Henrik Rydgård
86294cbe8e Merge pull request #225 from thedax/sysprop
Add a new SYSPROP enum variable.
2014-07-31 11:44:26 +02:00
The Dax
86cd0ccf1a Add a new SYSPROP enum variable. 2014-07-31 01:19:44 -04:00
Sacha
8b634fade4 Qt: Terminate the thread instead of quitting. Stops an annoying popup on OSX and should speed up exit on systems that didn't like the thread still running. 2014-07-26 01:35:49 +10:00
Henrik Rydgård
52351bdc2f Merge pull request #224 from xsacha/drawtext
Qt: Fix double ampersands in text.
2014-07-25 15:13:40 +02:00
Sacha
d3a88d4276 Qt: Fix double ampersands in text. 2014-07-25 17:15:59 +10:00
Sacha
f339bda6e2 SystemInfo is never installed by default, so make it optional. 2014-07-25 14:41:23 +10:00
Henrik Rydgard
14141b5a9e Add some hackery to work around the problem of textedit losing focus on click 2014-07-23 21:40:12 +02:00
Henrik Rydgard
79d189b545 atlastool buildfix (yeah, it's still a mess to build, I know) 2014-07-23 12:50:30 +02:00
Henrik Rydgard
9f4f49be66 TextEdit: Add single undo, paste over the contents 2014-07-22 22:16:09 +02:00
Henrik Rydgard
78941b0871 TextEdit: Clip to rect, scroll if caret outside rect 2014-07-22 10:20:51 +02:00
Henrik Rydgard
d826c7f181 Have PopupMultiChoice update their strings every frame 2014-07-22 09:54:55 +02:00
Sacha
8c1a48b90c Qt: Inhibit screensaver for all platforms using Qt5. 2014-07-22 16:03:42 +10:00
Henrik Rydgard
db6a57c8fe Try to detect GLES 3.1 as well as 3.0 2014-07-22 01:04:42 +02:00
Henrik Rydgard
4195da289c ChoiceWithValueDisplay: Allow translation of the value 2014-07-21 18:42:25 +02:00
Henrik Rydgard
9d8d64b321 TextEdit: Ctrl-C to copy the contents of the textbox. 2014-07-21 17:35:51 +02:00
Henrik Rydgard
6f6f6eb1fb TextEdit: Add utf-8 support, enable paste from clipboard 2014-07-21 11:59:05 +02:00
Henrik Rydgard
a4a17415a7 android: Allow querying the real display resolution as detected on start 2014-07-21 00:34:12 +02:00
Henrik Rydgard
dcd27e134d Add flag to identify events from mouses. 2014-07-20 22:24:54 +02:00
Henrik Rydgard
1d77b94355 Fix another operator shortcutting bug (tilt events) 2014-07-20 18:29:42 +02:00
Unknown W. Brackets
692dc810cf Update CityHash to v1.1.1/r15.
No major changes.
2014-07-20 08:56:01 -07:00