mirror of
https://github.com/ocornut/imgui.git
synced 2025-09-27 21:58:30 +00:00
46ca8bc16f
Rebased and squashed 47 commits. - ImGui WebGPU examples: removed swap-chain in favor of surfaceConfigure (8191) - New SDL2 WGPU example - Code optimization: removed the redundancies of assignment - Changes: ImGui code style - Lambdas RequestAdapter and RequestDevice callbacks declarated as signature - Validation Layer callbacks moved from lambdas to standard functions - Same changes of GLFW example: ImGui code style - Lambdas RequestAdapter and RequestDevice callbacks declarated as signature - Validation Layer callbacks moved from lambdas to standard functions - Scrollbars inhibition - Use of new direct CreateDevice function (w/o callback), added release of all resources used (not present in original example) - If the O.S. is Linux/Unix check if Wayland is the current active session and set DAWN_USE_WAYLAND=ON option (otherwise is always OFF) - example_glfw_wgpu: removed all workarounds - example_sdl2_wgpu: same style and functionality as GLFW example - sdl2wgpu tool to acquire surfaceDescriptor via SDL_syswm and to pass to wgpuInstanceCreateSurface to create WGPU Surface - css style to avoid the scrollbar - added `chek_surface_texture_status` function to check the `WGPUSurfaceTexture .status` and recreate the `Surface` in case of "not optimal" (bad) status. - Changed comment reference to `emwgpudawn` an EMSCRIPTEN WGPU binding maintained by Google - Adaptation to the last Google DAWN commit (1411699ba) Adaptation to the last EMSCRIPTEN 4.0.10, using new "--use-port=emdawnwebgpu" compiler/linker flag - Support for EMSCRIPTEN >= 4.0.10 (using "--use-port=emdawnwebgpu") and NEW support for WGPU-Native - Finalized the support of WGPU-Native for MacOS and minimal code adjustment - WebGPU examples - DAWN / WGPU native and EMSCRIPTEN - for GLFW/SDL2/SDL3 frameworks - "index.html" no more necessary (now the common one is used), "sdl2wgpu.cpp" It has been moved and renamed (sdl2_wgpu.c), "sdl2wgpu.h" no more necessary - added procedure for using CMake - added procedure for using CMake - Updated example_sdl3_wgpu build procedure for EMSCRIPTEN - WGPU+GLFW: Helper to create a WebGPU surface for Native application. Used only with WGPU-Native SDK: DAWN-Native already has a built-in function - WGPU+SDL2: helper to create a WebGPU surface (exclusively!) for Native/Desktop applications and available only together with WebGPU/WGPU backend - WGPU+SDL3: helper to create a WebGPU surface (exclusively!) for Native/Desktop applications and available only together with WebGPU/WGPU backend - WebGPU Helper functions and differentiation between the 4 compilation methods (via defines): Google DAWN (Native/Emscripten) / WGPU (Native/EMscripten) - example_glfw_wgpu: ImGui_ImplGLFW_CreateWGPUSurface_Helper (new helper function in imgui_impl_glfw backend), check status and error callback functions in imgui_impl_wgpu backend - example_sdl2_wgpu: ImGui_ImplSDL2_CreateWGPUSurface_Helper (new helper function in imgui_impl_sdl2 backend), check status and error callback functions in imgui_impl_wgpu backend - example_sdl3_wgpu: ImGui_ImplSDL3_CreateWGPUSurface_Helper (new helper function in imgui_impl_sdl3 backend), check status and error callback functions in imgui_impl_wgpu backend - Functions ImGui_ImplXXXX_CreateWGPUSurface_Helper were inserted into imgui_impl_xxxx (xxxx = GLFW / SDL2 / SDL3), and initialization has been integrated into every example: no more necessary, removed
92 lines
3.0 KiB
Makefile
92 lines
3.0 KiB
Makefile
#
|
|
# Makefile to use with emscripten
|
|
# See https://emscripten.org/docs/getting_started/downloads.html
|
|
# for installation instructions.
|
|
#
|
|
# This Makefile assumes you have loaded emscripten's environment.
|
|
# (On Windows, you may need to execute emsdk_env.bat or encmdprompt.bat ahead)
|
|
#
|
|
# Running `make` will produce three files:
|
|
# - web/index.html (current stored in the repository)
|
|
# - web/index.js
|
|
# - web/index.wasm
|
|
#
|
|
# All three are needed to run the demo.
|
|
|
|
CC = emcc
|
|
CXX = em++
|
|
WEB_DIR = web
|
|
EXE = $(WEB_DIR)/index.js
|
|
IMGUI_DIR = ../..
|
|
SOURCES = main.cpp
|
|
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
|
|
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glfw.cpp $(IMGUI_DIR)/backends/imgui_impl_wgpu.cpp
|
|
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
|
|
UNAME_S := $(shell uname -s)
|
|
CPPFLAGS =
|
|
LDFLAGS =
|
|
EMS =
|
|
|
|
##---------------------------------------------------------------------
|
|
## EMSCRIPTEN OPTIONS
|
|
##---------------------------------------------------------------------
|
|
|
|
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
|
|
EMS += -s DISABLE_EXCEPTION_CATCHING=1
|
|
LDFLAGS += -s USE_GLFW=3 -s USE_WEBGPU=1
|
|
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
|
|
|
|
# Build as single file (binary text encoded in .html file)
|
|
#LDFLAGS += -sSINGLE_FILE
|
|
|
|
# Emscripten allows preloading a file or folder to be accessible at runtime.
|
|
# The Makefile for this example project suggests embedding the misc/fonts/ folder into our application, it will then be accessible as "/fonts"
|
|
# See documentation for more details: https://emscripten.org/docs/porting/files/packaging_files.html
|
|
# (Default value is 0. Set to 1 to enable file-system and include the misc/fonts/ folder as part of the build.)
|
|
USE_FILE_SYSTEM ?= 0
|
|
ifeq ($(USE_FILE_SYSTEM), 0)
|
|
LDFLAGS += -s NO_FILESYSTEM=1
|
|
CPPFLAGS += -DIMGUI_DISABLE_FILE_FUNCTIONS
|
|
endif
|
|
ifeq ($(USE_FILE_SYSTEM), 1)
|
|
LDFLAGS += --no-heap-copy --preload-file ../../misc/fonts@/fonts
|
|
endif
|
|
|
|
##---------------------------------------------------------------------
|
|
## FINAL BUILD FLAGS
|
|
##---------------------------------------------------------------------
|
|
|
|
CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
|
|
#CPPFLAGS += -g
|
|
CPPFLAGS += -Wall -Wformat -Os $(EMS)
|
|
#LDFLAGS += --shell-file shell_minimal.html
|
|
LDFLAGS += $(EMS)
|
|
|
|
##---------------------------------------------------------------------
|
|
## BUILD RULES
|
|
##---------------------------------------------------------------------
|
|
|
|
%.o:%.cpp
|
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
|
|
|
|
%.o:$(IMGUI_DIR)/%.cpp
|
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
|
|
|
|
%.o:$(IMGUI_DIR)/backends/%.cpp
|
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
|
|
|
|
all: $(EXE)
|
|
@echo Build complete for $(EXE)
|
|
|
|
$(WEB_DIR):
|
|
mkdir $@
|
|
|
|
serve: all
|
|
python3 -m http.server -d $(WEB_DIR)
|
|
|
|
$(EXE): $(OBJS) $(WEB_DIR)
|
|
$(CXX) -o $@ $(OBJS) $(LDFLAGS)
|
|
|
|
clean:
|
|
rm -f $(EXE) $(OBJS) $(WEB_DIR)/*.js $(WEB_DIR)/*.wasm $(WEB_DIR)/*.wasm.pre
|