summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-14Merge remote-tracking branch 'origin/main' into DRTVWR-596Brad Linden
2023-12-09Revive Command modifier on macOSErik Kundiman
2023-12-09Fix alt dragging when not in full screenErik Kundiman
2023-12-06SL-20664 Potential fix for crash on startup in switchContextRunitaiLinden
2023-12-06SL-20695 Fix hardware probesAndrey Kleshchev
CoCreateInstance returns 'no interface supported' Preferable not to mix init types so switched everything.
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-11-30Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml
2023-11-30SL-19801 Inserting emoji characters from system emoji picker does not work ↵Alexander Gavriliuk
on macOS
2023-11-30Mac buildfixAndrey Lihatskiy
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-22SL-20603 Crash on CoInitializeAndrey Kleshchev
Don't mix CoInitialize and CoInitializeEx, one is global, other is threaded. CoInitialize(0) is equal to CoInitializeEx(0, COINIT_APARTMENTTHREADED) and MULTITHREADED is not compatible with APARTMENTTHREADED.
2023-11-16Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-11-16Clipboard implementation using SDLErik Kundiman
For now it's when there's no GTK, to minimise diff. They should all just use SDL.
2023-11-06Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-11-06Merge commit '439d26ccdc2864794036a8f6432664755f2b8234' into testErik Kundiman
2023-11-03DRTVWR-559 Fix for mac build.Dave Parks
2023-11-02SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix ↵Dave Parks
multihreaded GL not working on mac (thanks, Rye!)
2023-10-23SL-13610 build fixMnikolenko Productengine
2023-10-23SL-13610 [MAC] Manufacturer based searchAndrey Kleshchev
2023-10-23SL-13610 [MAC] WIP filter out incompatible devicesAndrey Kleshchev
2023-10-23SL-13610 [MAC] WIP enable initing devices by local idAndrey Kleshchev
2023-10-23SL-13610 [MAC] WIP List HID available devices in joystick selectionAndrey Kleshchev
Doesn't filter the list yet, just shows full list of usb devices Selecting visible devices doesn't work yet
2023-09-20Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-09-19SL-20177: Blind attempt at fixing crash in SetWindowLongPtr. Guess based on ↵Cosmic Linden
the fact that crashes started around the time VRAM accounting was added.
2023-09-14Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-14getNativeKeyData impl for non Darwin non GTKErik Kundiman
Copying from GTK users part though.
2023-09-11Fix macOS crash by explicitly ask SDL2 for GL 4.1Erik Kundiman
The reason it kept crashing was because it is now a requirement for the OpenGL version to be "detected" as equal or higher than 4.09. All this time (or maybe since macOS switching to SDL2), Megapahit has been given only OpenGL 2.1 by macOS (4.1 on SL viewer & Alchemy, though funny it's 2.1 too somehow on Kokua), and now is fixed by setting the profile to core 4.1 from SDL2. The commit is on this branch only cause somehow this fix didn't work on main branch (it crashed). So 6.6.x is stuck with 2.1 for macOS. We're moving forward with this branch anyway, which will be merged to main in the (hopefully near) future.
2023-09-11Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-11Revive HiDPI support & multi threaded OpenGLErik Kundiman
See 7dd1149e3649057f0962b85bdc467f4e9299b235. The attributes only needed to be moved from LLWindowMacOS X to LLWindowSDL.
2023-09-10SDL window overrides all window pure virtual funcsErik Kundiman
including the new getAvailableVRAMMegabytes. The "override" word must be explicitly stated now.
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-10Darwin hasn't been using llwindowmacosxErik Kundiman
2023-09-05Preprocess non portable GL funcs & macrosErik Kundiman
so that implementations that don't include a certain GL implementation won't fail trying to compile the code.
2023-08-26Make using the system browser for links worksErik Kundiman
First, in order for launch_url.sh to be executable, it needs to be installed as a program. Secondly, the spawn browser command path needs to be adjusted accordingly. And last, add chrome (applies to chromium too on FBSD), to the list of browser commands to try (so chrome wasn't there :/, but dillo has always been XD, and that's why it kept opening Dillo here haha).
2023-08-21Darwin not (directly) relying on Carbon & Obj-CErik Kundiman
HiDPI support & multi threaded OpenGL haven't been used since we switched to SDL2 on Darwin, and so far there hasn't been any sign that things aren't working any more significantly.
2023-08-21Darwin & any platform can, and should, use SDLErik Kundiman
The alt mouse click to cam is broken for now on macOS, but this is the path we've chosen.
2023-08-17Make SDL exclude immintrin.h when not on IntelErik Kundiman
I don't know why SDL2 isn't defining the macro by default when it's been compiled and installed on an Arm environment, that it has to be manually defined. I may be missing something here..
2023-08-17Re-enable x11_detect_VRAM_kb useErik Kundiman
It's an error according to GCC when defined but not used. It could, and probably should, still be used anyway, just not the SDL version.
2023-08-16Revive alt mouse click override with X11Erik Kundiman
On SDL2, there are no more x11.lock_func or x11.unlock_func, so the camming is too sensitive, and alt tab is overridden too when it shouldn't be. It's better than nothing at all for now. This feature should be re-perfected later.
2023-08-16Revive mouse wheel on SDL2Erik Kundiman
2023-08-15SDL 1.2 to 2.0 migrationErik Kundiman
Both keycodes and scancodes are now 32 bits, so the key type is lengthened from U16 to U32.
2023-08-01Initialise vars so they wouldn't be errors on GCCErik Kundiman
2023-07-29The Linden libraries can be installed nowErik Kundiman
Useful when installed as shared libraries, so other viewer executables can share these libraries.
2023-07-29Setting BUILD_SHARED_LIBS on is now possibleErik Kundiman
by removing cyclic dependencies, and allowing shlib undefined on SLPlugin alone.
2023-07-19Fix what GCC considers as misleading indentationsErik Kundiman
The style conventions aren't really being followed that the different styles of using tabs or spaces as indentations lead to GCC considering them as misleading. It's better to just fix them (but as little as possible as to minimise this fork difference from upstream) than to supress the warnings from being treated as errors.
2023-07-19Disable g_thread_init when using system libsErik Kundiman
On GCC, compiling against a recent GTK2 version would stop on deprecated pre-processors.
2023-07-19FreeBSD has SDL keyboard & window files built tooErik Kundiman
and any Linux SDL code should be applied to FreeBSD too.
2023-07-19Stubs for missing implementations that use SDLErik Kundiman
in order to get rid of this: error: invalid new-expression of abstract class type ‘LLWindowSDL’ fullscreen, clearBg, enable_vsync, use_gl, ignore_pixel_depth, fsaa_samples); note: because the following virtual functions are pure within ‘LLWindowSDL’: class LLWindowSDL : public LLWindow ^~~~~~~~~~~ virtual void* createSharedContext() = 0; ^~~~~~~~~~~~~~~~~~~ virtual void makeContextCurrent(void* context) = 0; ^~~~~~~~~~~~~~~~~~ virtual void destroySharedContext(void* context) = 0; ^~~~~~~~~~~~~~~~~~~~ virtual void toggleVSync(bool enable_vsync) = 0; ^~~~~~~~~~~ The window has been relying on some, mostly GL context related, methods. These methods are declared abstract, so for now they're implemented using member functions that do nothing, return nothing.